poi-import: fix build dependencies

- Compilation + tests work now

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1709356 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/.classpath b/.classpath
index 56f64db7f9f8f0cad4b2fbc90714ad16dd605705..ab1f0776ca1390c74e7123123a168463b23ac05b 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -21,6 +21,7 @@
        <classpathentry kind="lib" path="ooxml-lib/xmlbeans-2.6.0.jar"/>
        <classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
        <classpathentry kind="lib" path="lib/junit-4.12.jar"/>
+  <classpathentry kind="lib" path="ooxml-lib/curvesapi-1.02.jar"/>
        <classpathentry kind="lib" path="ooxml-lib/ooxml-schemas-1.2.jar" sourcepath="ooxml-lib/ooxml-schemas-1.2-sources.jar"/>
        <classpathentry kind="lib" path="ooxml-lib/ooxml-security-1.0.jar" sourcepath="ooxml-lib/ooxml-security-1.0-sources.jar"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

diff --git a/build.xml b/build.xml
index d4730c69725f9ab80e3d609b0ef9c19a9dee3de6..43c580e4e9beb1c88a5d2ad300918a4fb23500bc 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -177,6 +177,9 @@ under the License.
     <property name="dsig.sl4j-api.url" value="${repository.m2}/maven2/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar"/>
 
     <!-- jars in the lib-ooxml directory, see the fetch-ooxml-jars target-->
+    <property name="ooxml.curvesapi.jar" location="${ooxml.lib}/curvesapi-1.02.jar"/>
+    <property name="ooxml.curvesapi.url"
+              value="${repository.m2}/maven2/com/github/virtuald/curvesapi/1.02/curvesapi-1.02.jar"/>
     <property name="ooxml.xmlbeans23.jar" location="${ooxml.lib}/xmlbeans-2.3.0.jar"/>
     <property name="ooxml.xmlbeans23.url"
               value="${repository.m2}/maven2/org/apache/xmlbeans/xmlbeans/2.3.0/xmlbeans-2.3.0.jar"/>
@@ -276,6 +279,7 @@ under the License.
     </path>
 
     <path id="ooxml.classpath">
+        <pathelement location="${ooxml.curvesapi.jar}"/>
         <pathelement location="${ooxml.xmlbeans26.jar}"/>
         <pathelement location="${ooxml.xsds.jar}"/>
         <path refid="main.classpath"/>
@@ -319,6 +323,7 @@ under the License.
     </path>
 
     <path id="ooxml-lite.classpath">
+        <pathelement location="${ooxml.curvesapi.jar}"/>
         <pathelement location="${ooxml.xmlbeans26.jar}"/>
         <pathelement location="${ooxml.lite.output.dir}"/> <!-- instead of ooxml-xsds.jar use the filtered classes-->
         <path refid="main.classpath"/>
@@ -558,6 +563,7 @@ under the License.
         <condition property="ooxml.jars.present">
             <or>
                 <and>
+                    <available file="${ooxml.curvesapi.jar}"/>
                     <available file="${ooxml.xmlbeans23.jar}"/>
                     <available file="${ooxml.xmlbeans26.jar}"/>
                 </and>
@@ -567,6 +573,10 @@ under the License.
     </target>
     <target name="fetch-ooxml-jars" depends="check-ooxml-jars" unless="ooxml.jars.present">
         <mkdir dir="${ooxml.lib}"/>
+        <antcall target="downloadfile">
+            <param name="sourcefile" value="${ooxml.curvesapi.url}"/>
+            <param name="destfile" value="${ooxml.curvesapi.jar}"/>
+        </antcall>
         <antcall target="downloadfile">
             <param name="sourcefile" value="${ooxml.xmlbeans23.url}"/>
             <param name="destfile" value="${ooxml.xmlbeans23.jar}"/>

diff --git a/maven/poi-ooxml.pom b/maven/poi-ooxml.pom
index 28195b55105ce774a0b55e40acedf8197511530f..5850def217aed5bfcbb29a27be803b7003f2c711 100644 (file)
--- a/maven/poi-ooxml.pom
+++ b/maven/poi-ooxml.pom
@@ -69,5 +69,10 @@
       <artifactId>poi-ooxml-schemas</artifactId>
       <version>@VERSION@</version>
     </dependency>
+    <dependency>
+       <groupId>com.github.virtuald</groupId>
+       <artifactId>curvesapi</artifactId>
+       <version>1.02</version>
+    </dependency>
   </dependencies>
 </project>

diff --git a/src/ooxml/java/org/apache/poi/xdgf/geom/SplineCollector.java b/src/ooxml/java/org/apache/poi/xdgf/geom/SplineCollector.java
index f1037a4fb853feaa50441c3483c80105f782c329..a977cb627aae5eefb8e68afb90f3aa36bf997442 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xdgf/geom/SplineCollector.java
+++ b/src/ooxml/java/org/apache/poi/xdgf/geom/SplineCollector.java
@@ -20,11 +20,15 @@ package org.apache.poi.xdgf.geom;
 import java.awt.geom.Point2D;
 import java.util.ArrayList;
 
-import org.apache.poi.ss.formula.functions.LookupUtils.ValueVector;
 import org.apache.poi.xdgf.usermodel.XDGFShape;
 import org.apache.poi.xdgf.usermodel.section.geometry.SplineKnot;
 import org.apache.poi.xdgf.usermodel.section.geometry.SplineStart;
 
+import com.graphbuilder.curve.ControlPath;
+import com.graphbuilder.curve.ShapeMultiPath;
+import com.graphbuilder.curve.ValueVector;
+import com.graphbuilder.geom.PointFactory;
+
 public class SplineCollector {
 
     SplineStart _start;

diff --git a/src/ooxml/java/org/apache/poi/xdgf/geom/SplineRenderer.java b/src/ooxml/java/org/apache/poi/xdgf/geom/SplineRenderer.java
index 7757860084fec0b7d2e11d24cb063352f7b9b9ef..a478ae4a9a3f84b2e39150d3981035561853fa80 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xdgf/geom/SplineRenderer.java
+++ b/src/ooxml/java/org/apache/poi/xdgf/geom/SplineRenderer.java
@@ -17,7 +17,12 @@
 
 package org.apache.poi.xdgf.geom;
 
-import org.apache.poi.ss.formula.functions.LookupUtils.ValueVector;
+import com.graphbuilder.curve.ControlPath;
+import com.graphbuilder.curve.GroupIterator;
+import com.graphbuilder.curve.NURBSpline;
+import com.graphbuilder.curve.ShapeMultiPath;
+import com.graphbuilder.curve.ValueVector;
+
 
 public class SplineRenderer {
 

diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java b/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java
index c235f4843bcbf8ce38ce7d8f2700dc7f7e977047..353d694f9b98b05f9019d680b263c4a6346960af 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java
+++ b/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java
@@ -20,11 +20,14 @@ package org.apache.poi.xdgf.usermodel.section.geometry;
 import java.awt.geom.Point2D;
 
 import org.apache.poi.POIXMLException;
-import org.apache.poi.ss.formula.functions.LookupUtils.ValueVector;
 import org.apache.poi.xdgf.geom.SplineRenderer;
 import org.apache.poi.xdgf.usermodel.XDGFCell;
 import org.apache.poi.xdgf.usermodel.XDGFShape;
 
+import com.graphbuilder.curve.ControlPath;
+import com.graphbuilder.curve.ShapeMultiPath;
+import com.graphbuilder.curve.ValueVector;
+import com.graphbuilder.geom.PointFactory;
 import com.microsoft.schemas.office.visio.x2012.main.CellType;
 import com.microsoft.schemas.office.visio.x2012.main.RowType;