svn commit: r1879965 - in /poi/trunk/src/ooxml/java/org/apache/poi/xdgf: geom/Dimension2dDouble.java usermodel/XDGFPage.java util/VsdxToPng.java

[fanningpj]

Author: fanningpj
Date: Thu Jul 16 15:59:28 2020
New Revision: 1879965

URL: http://svn.apache.org/viewvc?rev=1879965&view=rev
Log:
remove more deprecated code

Removed:
    poi/trunk/src/ooxml/java/org/apache/poi/xdgf/geom/Dimension2dDouble.java
Modified:
    poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPage.java
    poi/trunk/src/ooxml/java/org/apache/poi/xdgf/util/VsdxToPng.java

Modified: poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPage.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPage.java?rev=1879965&r1=1879964&r2=1879965&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPage.java 
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPage.java Thu 
Jul 16 15:59:28 2020
@@ -24,8 +24,6 @@ import com.microsoft.schemas.office.visi
 import org.apache.poi.ooxml.POIXMLException;
 import org.apache.poi.util.Dimension2DDouble;
 import org.apache.poi.util.Internal;
-import org.apache.poi.util.Removal;
-import org.apache.poi.xdgf.geom.Dimension2dDouble;
 
 /**
  * Provides the API to work with an underlying page
@@ -75,26 +73,8 @@ public class XDGFPage {
 
     /**
      * @return width/height of page
-     * @deprecated use {@link #getPageDimensions()}
      */
-    @Removal(version = "6.0.0")
-    @Deprecated
-    public Dimension2dDouble getPageSize() {
-        XDGFCell w = _pageSheet.getCell("PageWidth");
-        XDGFCell h = _pageSheet.getCell("PageHeight");
-
-        if (w == null || h == null)
-            throw new POIXMLException("Cannot determine page size");
-
-        return new Dimension2dDouble(Double.parseDouble(w.getValue()),
-                Double.parseDouble(h.getValue()));
-    }
-
-    /**
-     * @return width/height of page
-     * @since POI 5.0.0
-     */
-    public Dimension2DDouble getPageDimensions() {
+    public Dimension2DDouble getPageSize() {
         XDGFCell w = _pageSheet.getCell("PageWidth");
         XDGFCell h = _pageSheet.getCell("PageHeight");
 
@@ -128,7 +108,7 @@ public class XDGFPage {
      * @return bounding box of page
      */
     public Rectangle2D getBoundingBox() {
-        Dimension2DDouble sz = getPageDimensions();
+        Dimension2DDouble sz = getPageSize();
         Point2D.Double offset = getPageOffset();
 
         return new Rectangle2D.Double(-offset.getX(), -offset.getY(),

Modified: poi/trunk/src/ooxml/java/org/apache/poi/xdgf/util/VsdxToPng.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/util/VsdxToPng.java?rev=1879965&r1=1879964&r2=1879965&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/util/VsdxToPng.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/util/VsdxToPng.java Thu Jul 16 
15:59:28 2020
@@ -61,7 +61,7 @@ public class VsdxToPng {
     public static void renderToPng(XDGFPage page, File outFile, double scale,
             ShapeRenderer renderer) throws IOException {
 
-        Dimension2DDouble sz = page.getPageDimensions();
+        Dimension2DDouble sz = page.getPageSize();
 
         int width = (int) (scale * sz.getWidth());
         int height = (int) (scale * sz.getHeight());



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org