]> source.dussan.org Git - poi.git/commitdiff
explicitly convert to float for JDK 5
authorSergey Vladimirov <sergey@apache.org>
Sun, 23 Oct 2011 21:53:16 +0000 (21:53 +0000)
committerSergey Vladimirov <sergey@apache.org>
Sun, 23 Oct 2011 21:53:16 +0000 (21:53 +0000)
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1187982 13f79535-47bb-0310-9956-ffa450edef68

src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java

index 594aa277b334a048fa2427d97033e3b9408dc131..10490c0c9a6bafe6675c5bec9b34f7bf5a78a40d 100644 (file)
@@ -19,7 +19,6 @@
 \r
 package org.apache.poi.xslf.usermodel;\r
 \r
-import org.apache.poi.sl.usermodel.ShapeContainer;\r
 import org.apache.poi.util.Beta;\r
 import org.apache.poi.util.Units;\r
 import org.apache.xmlbeans.XmlObject;\r
@@ -132,8 +131,9 @@ public class XSLFFreeformShape extends XSLFAutoShape {
             for(XmlObject ch : spPath.selectPath("*")){\r
                 if(ch instanceof CTPath2DMoveTo){\r
                     CTAdjPoint2D pt = ((CTPath2DMoveTo)ch).getPt();\r
-                    path.moveTo((float)Units.toPoints((Long)pt.getX())*scaleW,\r
-                                (float)Units.toPoints((Long)pt.getY())*scaleH);\r
+                    path.moveTo(\r
+                            (float) (Units.toPoints((Long) pt.getX()) * scaleW),\r
+                            (float) (Units.toPoints((Long) pt.getY()) * scaleH));\r
                 } else if (ch instanceof CTPath2DLineTo){\r
                     CTAdjPoint2D pt = ((CTPath2DLineTo)ch).getPt();\r
                     path.lineTo((float)Units.toPoints((Long)pt.getX()),\r
@@ -144,13 +144,12 @@ public class XSLFFreeformShape extends XSLFAutoShape {
                     CTAdjPoint2D pt2 = bez.getPtArray(1);\r
                     CTAdjPoint2D pt3 = bez.getPtArray(2);\r
                     path.curveTo(\r
-                            (float)Units.toPoints((Long) pt1.getX())*scaleW,\r
-                            (float)Units.toPoints((Long) pt1.getY())*scaleH,\r
-                            (float)Units.toPoints((Long) pt2.getX())*scaleW,\r
-                            (float)Units.toPoints((Long) pt2.getY())*scaleH,\r
-                            (float)Units.toPoints((Long) pt3.getX())*scaleW,\r
-                            (float)Units.toPoints((Long) pt3.getY())*scaleH\r
-                    );\r
+                            (float) (Units.toPoints((Long) pt1.getX()) * scaleW),\r
+                            (float) (Units.toPoints((Long) pt1.getY()) * scaleH),\r
+                            (float) (Units.toPoints((Long) pt2.getX()) * scaleW),\r
+                            (float) (Units.toPoints((Long) pt2.getY()) * scaleH),\r
+                            (float) (Units.toPoints((Long) pt3.getX()) * scaleW),\r
+                            (float) (Units.toPoints((Long) pt3.getY()) * scaleH)                    );\r
 \r
                 } else if (ch instanceof CTPath2DClose){\r
                     path.closePath();\r