From 55c924c5d2a1780337c0277cc84259cf98200e59 Mon Sep 17 00:00:00 2001 From: Yegor Kozlov Date: Sat, 29 May 2010 18:31:04 +0000 Subject: [PATCH] removed deprecation warnings to keep javac quiet git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@949434 13f79535-47bb-0310-9956-ffa450edef68 --- .../poi/hssf/usermodel/examples/CellComments.java | 2 +- .../org/apache/poi/xssf/model/TestCommentsTable.java | 8 +++----- .../org/apache/poi/xssf/usermodel/TestXSSFSheet.java | 11 +++++++---- .../src/org/apache/poi/hslf/model/PPGraphics2D.java | 1 + 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/examples/src/org/apache/poi/hssf/usermodel/examples/CellComments.java b/src/examples/src/org/apache/poi/hssf/usermodel/examples/CellComments.java index 84efa9cd2..c3a213d58 100644 --- a/src/examples/src/org/apache/poi/hssf/usermodel/examples/CellComments.java +++ b/src/examples/src/org/apache/poi/hssf/usermodel/examples/CellComments.java @@ -89,7 +89,7 @@ public class CellComments { * It works, the comment is visible. */ comment2.setRow(6); - comment2.setColumn((short)1); + comment2.setColumn(1); FileOutputStream out = new FileOutputStream("poi_comment.xls"); wb.write(out); diff --git a/src/ooxml/testcases/org/apache/poi/xssf/model/TestCommentsTable.java b/src/ooxml/testcases/org/apache/poi/xssf/model/TestCommentsTable.java index b423afd73..57fcfb9b7 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/model/TestCommentsTable.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/model/TestCommentsTable.java @@ -27,10 +27,7 @@ import junit.framework.TestCase; import org.apache.poi.POIXMLDocumentPart; import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.XSSFTestDataSamples; -import org.apache.poi.xssf.usermodel.XSSFComment; -import org.apache.poi.xssf.usermodel.XSSFRichTextString; -import org.apache.poi.xssf.usermodel.XSSFSheet; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.apache.poi.xssf.usermodel.*; import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTComment; import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCommentList; import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTComments; @@ -131,7 +128,8 @@ public class TestCommentsTable extends TestCase { Cell c1r2s2 = r2s2.createCell(1); assertNull(c1r2s2.getCellComment()); - Comment cc2 = sheet2.createComment(); + Drawing dg = sheet2.createDrawingPatriarch(); + Comment cc2 = dg.createCellComment(new XSSFClientAnchor()); cc2.setAuthor("Also POI"); cc2.setString(new XSSFRichTextString("A new comment")); c1r2s2.setCellComment(cc2); diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java index db4a26c49..cb0839e82 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java @@ -171,9 +171,11 @@ public final class TestXSSFSheet extends BaseTestSheet { public void testGetCellComment() { XSSFWorkbook workbook = new XSSFWorkbook(); XSSFSheet sheet = workbook.createSheet(); - XSSFComment comment = sheet.createComment(); + XSSFDrawing dg = sheet.createDrawingPatriarch(); + XSSFComment comment = dg.createCellComment(new XSSFClientAnchor()); + XSSFCell cell = sheet.createRow(9).createCell(2); comment.setAuthor("test C10 author"); - sheet.setCellComment("C10", comment); + cell.setCellComment(comment); assertNotNull(sheet.getCellComment(9, 2)); assertEquals("test C10 author", sheet.getCellComment(9, 2).getAuthor()); @@ -183,13 +185,14 @@ public final class TestXSSFSheet extends BaseTestSheet { XSSFWorkbook workbook = new XSSFWorkbook(); XSSFSheet sheet = workbook.createSheet(); - XSSFComment comment = sheet.createComment(); + XSSFDrawing dg = sheet.createDrawingPatriarch(); + XSSFComment comment = dg.createCellComment(new XSSFClientAnchor()); Cell cell = sheet.createRow(0).createCell(0); CommentsTable comments = sheet.getCommentsTable(false); CTComments ctComments = comments.getCTComments(); - sheet.setCellComment("A1", comment); + cell.setCellComment(comment); assertEquals("A1", ctComments.getCommentList().getCommentArray(0).getRef()); comment.setAuthor("test A1 author"); assertEquals("test A1 author", comments.getAuthor((int) ctComments.getCommentList().getCommentArray(0).getAuthorId())); diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/PPGraphics2D.java b/src/scratchpad/src/org/apache/poi/hslf/model/PPGraphics2D.java index e81bf5080..747c90397 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/model/PPGraphics2D.java +++ b/src/scratchpad/src/org/apache/poi/hslf/model/PPGraphics2D.java @@ -1655,6 +1655,7 @@ public final class PPGraphics2D extends Graphics2D implements Cloneable { * @see java.awt.FontMetrics * @see java.awt.Graphics#getFontMetrics() */ + @SuppressWarnings("deprecation") public FontMetrics getFontMetrics(Font f) { return Toolkit.getDefaultToolkit().getFontMetrics(f); }