- Compilation + tests work now git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1709356 13f79535-47bb-0310-9956-ffa450edef68pull/24/head
@@ -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"/> |
@@ -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}"/> |
@@ -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> |
@@ -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; |
@@ -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 { | |||
@@ -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; | |||