aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build.xml547
-rw-r--r--src/java/org/apache/poi/sl/draw/DrawSimpleShape.java8
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTAdjustHandleList.java100
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTAngle.java70
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTColor.java230
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTColorMRU.java107
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTComplementTransform.java46
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTConnection.java95
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTConnectionSiteList.java92
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTCustomGeometry2D.java237
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTEmbeddedWAVAudioFile.java152
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTFixedPercentage.java70
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTGammaTransform.java46
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTGeomGuide.java112
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTGeomGuideList.java92
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTGeomRect.java171
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTGrayscaleTransform.java46
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTGroupTransform2D.java291
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTHslColor.java222
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTHyperlink.java400
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTInverseGammaTransform.java46
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTInverseTransform.java46
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTOfficeArtExtension.java122
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTOfficeArtExtensionList.java92
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTPath2D.java304
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTPath2DArcTo.java171
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTPath2DClose.java46
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTPath2DCubicBezierTo.java94
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTPath2DLineTo.java82
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTPath2DList.java92
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTPath2DMoveTo.java82
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTPath2DQuadBezierTo.java94
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTPercentage.java70
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTPoint2D.java93
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTPoint3D.java116
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedAngle.java70
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedPercentage.java70
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTPositivePercentage.java70
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTPositiveSize2D.java93
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTPresetColor.java184
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTPresetGeometry2D.java112
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTPresetTextShape.java112
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTRatio.java93
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTRelativeRect.java203
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTSRgbColor.java187
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTScRgbColor.java222
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTScale2D.java114
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTSchemeColor.java184
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTSphereCoords.java116
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTSystemColor.java220
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTTransform2D.java229
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/CTVector3D.java116
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/ObjectFactory.java2024
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/STBlackWhiteMode.java149
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/STPathFillMode.java109
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/STPresetColorVal.java1181
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/STRectAlignment.java133
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/STSchemeColorVal.java197
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/STShapeType.java1557
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/STTextShapeType.java389
-rw-r--r--src/java/org/apache/poi/sl/draw/binding/package-info.java18
-rw-r--r--src/java/org/apache/poi/sl/draw/geom/AdjustHandle.java23
-rw-r--r--src/java/org/apache/poi/sl/draw/geom/AdjustPoint.java (renamed from src/java/org/apache/poi/sl/draw/binding/CTAdjPoint2D.java)60
-rw-r--r--src/java/org/apache/poi/sl/draw/geom/AdjustValue.java6
-rw-r--r--src/java/org/apache/poi/sl/draw/geom/ArcToCommand.java75
-rw-r--r--src/java/org/apache/poi/sl/draw/geom/ClosePathCommand.java32
-rw-r--r--src/java/org/apache/poi/sl/draw/geom/ConnectionSite.java (renamed from src/java/org/apache/poi/sl/draw/binding/CTConnectionSite.java)81
-rw-r--r--src/java/org/apache/poi/sl/draw/geom/CurveToCommand.java85
-rw-r--r--src/java/org/apache/poi/sl/draw/geom/CustomGeometry.java132
-rw-r--r--src/java/org/apache/poi/sl/draw/geom/Guide.java70
-rw-r--r--src/java/org/apache/poi/sl/draw/geom/LineToCommand.java59
-rw-r--r--src/java/org/apache/poi/sl/draw/geom/MoveToCommand.java59
-rw-r--r--src/java/org/apache/poi/sl/draw/geom/Path.java172
-rw-r--r--src/java/org/apache/poi/sl/draw/geom/PolarAdjustHandle.java (renamed from src/java/org/apache/poi/sl/draw/binding/CTPolarAdjustHandle.java)141
-rw-r--r--src/java/org/apache/poi/sl/draw/geom/PresetGeometries.java119
-rw-r--r--src/java/org/apache/poi/sl/draw/geom/PresetParser.java573
-rw-r--r--src/java/org/apache/poi/sl/draw/geom/QuadToCommand.java70
-rw-r--r--src/java/org/apache/poi/sl/draw/geom/XYAdjustHandle.java (renamed from src/java/org/apache/poi/sl/draw/binding/CTXYAdjustHandle.java)137
-rw-r--r--src/java/org/apache/poi/sl/usermodel/RectAlign.java2
-rw-r--r--src/multimodule/ooxml-schemas/java9/module-info.classbin0 -> 1928 bytes
-rw-r--r--src/multimodule/ooxml-schemas/java9/module-info.java50
-rw-r--r--src/multimodule/ooxml-security/java9/module-info.classbin0 -> 660 bytes
-rw-r--r--src/multimodule/ooxml-security/java9/module-info.java31
-rw-r--r--src/multimodule/poi/java9/module-info.java86
-rw-r--r--src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java7
-rw-r--r--src/ooxml/testcases/org/apache/poi/xslf/geom/TestFormulaParser.java31
-rw-r--r--src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java546
-rw-r--r--src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFAutoShape.java108
-rw-r--r--src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java5
-rw-r--r--src/testcases/org/apache/poi/sl/draw/geom/TestPresetGeometries.java24
90 files changed, 2129 insertions, 13491 deletions
diff --git a/build.xml b/build.xml
index dab9091a59..f6fb8230fd 100644
--- a/build.xml
+++ b/build.xml
@@ -50,10 +50,11 @@ under the License.
<property name="repository.m2" value="https://repo1.maven.org"/>
<property name="repository.pentaho" value="https://nexus.pentaho.org/"/>
- <property name="main.lib" location="lib"/>
- <property name="ooxml.lib" location="ooxml-lib"/>
- <property name="ooxml.test.lib" location="ooxml-testlib"/>
- <property name="compile.lib" location="compile-lib"/>
+ <property name="main.lib" location="${basedir}/lib/main"/>
+ <property name="ooxml.lib" location="${basedir}/lib/ooxml"/>
+ <property name="ooxml-tests.lib" location="${basedir}/lib/ooxml-tests"/>
+ <property name="util.lib" location="${basedir}/lib/util"/>
+
<!-- compiler options options -->
<property name="jdk.version.source" value="1.8" description="JDK version of source code"/>
@@ -64,6 +65,10 @@ under the License.
<contains string="${java.vendor}" substring="IBM" casesensitive="false"/>
</condition>
+ <condition property="isJava8">
+ <equals arg1="${ant.java.version}" arg2="1.8"/>
+ </condition>
+
<!-- add addOpens parameter for Java 9 and higher -->
<condition property="addOpens">
<not><matches pattern="^1\..*" string="${java.version}"/></not>
@@ -168,137 +173,99 @@ under the License.
<property name="excelant.output.test.dir" location="build/excelant-test-classes"/>
<property name="excelant.testokfile" location="build/excelant-testokfile.txt"/>
+
+ <scriptdef name="dependency" language="javascript" description="define properties for library dependency">
+ <attribute name="prefix"/>
+ <attribute name="artifact"/>
+ <attribute name="usage"/>
+ <attribute name="packaging"/>
+ <attribute name="repo"/>
+ <attribute name="snapshot"/>
+ <attribute name="query"/>
+ <![CDATA[
+ var parts = attributes.get("artifact").split(/:/);
+ var packaging = attributes.get("packaging") || "jar";
+ var version = attributes.get("snapshot") || parts[2];
+ var repo = attributes.get("repo");
+ if (repo == null) {
+ repo = project.getProperty("repository.m2")+"/maven2";
+ }
+ var query = attributes.get("query") || "";
+ var jarLoc = project.getProperty("basedir")+"/lib/"+attributes.get("usage")+"/"+
+ parts[1]+"-"+parts[2]+"."+packaging;
+ var urlLoc = repo+"/"+parts[0].replace(/\./g,"/")+"/"+parts[1]+"/"+parts[2]+"/"+
+ parts[1]+"-"+(attributes.get("snapshot") || parts[2])+"."+packaging+query;
+ project.setProperty(attributes.get("prefix")+"."+packaging, jarLoc);
+ project.setProperty(attributes.get("prefix")+".url", urlLoc);
+ ]]>
+ <!-- TODO: add library to a queue for downloading ... -->
+ </scriptdef>
+
+
<!-- jars in the /lib directory, see the fetch-jars target-->
- <property name="main.commons-logging.jar" location="${main.lib}/commons-logging-1.2.jar"/>
- <property name="main.commons-logging.url"
- value="${repository.m2}/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
- <property name="main.commons-codec.jar" location="${main.lib}/commons-codec-1.14.jar"/>
- <property name="main.commons-codec.url"
- value="${repository.m2}/maven2/commons-codec/commons-codec/1.14/commons-codec-1.14.jar"/>
- <property name="main.log4j.jar" location="${main.lib}/log4j-1.2.17.jar"/>
- <property name="main.log4j.url" value="${repository.m2}/maven2/log4j/log4j/1.2.17/log4j-1.2.17.jar"/>
- <property name="main.junit.jar" location="${main.lib}/junit-4.13.jar"/>
- <property name="main.junit.url" value="${repository.m2}/maven2/junit/junit/4.13/junit-4.13.jar"/>
- <property name="main.jmh.jar" location="${main.lib}/jmh-core-1.19.jar"/>
- <property name="main.jmh.url" value="${repository.m2}/maven2/org/openjdk/jmh/jmh-core/1.19/jmh-core-1.19.jar"/>
- <property name="main.jmhAnnotation.jar" location="${main.lib}/jmh-generator-annprocess-1.19.jar"/>
- <property name="main.jmhAnnotation.url" value="${repository.m2}/maven2/org/openjdk/jmh/jmh-generator-annprocess/1.19/jmh-generator-annprocess-1.19.jar"/>
-
- <property name="main.hamcrest.jar" location="${main.lib}/hamcrest-core-1.3.jar"/>
- <property name="main.hamcrest.url" value="${repository.m2}/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
- <property name="main.xmlunit.jar" location="${main.lib}/xmlunit-core-2.5.1.jar"/>
- <property name="main.xmlunit.url" value="${repository.m2}/maven2/org/xmlunit/xmlunit-core/2.5.1/xmlunit-core-2.5.1.jar"/>
- <property name="main.mockito.jar" location="${main.lib}/mockito-core-3.2.4.jar"/>
- <property name="main.mockito.url" value="${repository.m2}/maven2/org/mockito/mockito-core/3.2.4/mockito-core-3.2.4.jar"/>
- <property name="main.byte-buddy.jar" location="${main.lib}/byte-buddy-1.10.1.jar"/>
- <property name="main.byte-buddy.url" value="${repository.m2}/maven2/net/bytebuddy/byte-buddy/1.10.1/byte-buddy-1.10.1.jar"/>
- <property name="main.byte-buddy-agent.jar" location="${main.lib}/byte-buddy-agent-1.10.1.jar"/>
- <property name="main.byte-buddy-agent.url" value="${repository.m2}/maven2/net/bytebuddy/byte-buddy-agent/1.10.1/byte-buddy-agent-1.10.1.jar"/>
- <property name="main.ant.jar" location="${main.lib}/ant-1.10.1.jar"/>
- <property name="main.objenesis.jar" location="${main.lib}/objenesis-2.6.jar"/>
- <property name="main.objenesis.url" value="${repository.m2}/maven2/org/objenesis/objenesis/2.6/objenesis-2.6.jar"/>
- <property name="main.ant.url" value="${repository.m2}/maven2/org/apache/ant/ant/1.10.1/ant-1.10.1.jar"/>
- <property name="main.antlauncher.jar" location="${main.lib}/ant-launcher-1.10.1.jar"/>
- <property name="main.antlauncher.url" value="${repository.m2}/maven2/org/apache/ant/ant-launcher/1.10.1/ant-launcher-1.10.1.jar"/>
- <property name="main.commons-collections4.jar" location="${main.lib}/commons-collections4-4.4.jar"/>
- <property name="main.commons-collections4.url"
- value="${repository.m2}/maven2/org/apache/commons/commons-collections4/4.4/commons-collections4-4.4.jar"/>
- <property name="main.commons-math3.jar" location="${main.lib}/commons-math3-3.6.1.jar"/>
- <property name="main.commons-math3.url"
- value="${repository.m2}/maven2/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1.jar"/>
- <property name="main.xmlbind.jar" location="${main.lib}/jaxb-api-2.3.1.jar"/>
- <property name="main.xmlbind.url"
- value="${repository.m2}/maven2/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1.jar"/>
- <property name="main.xmlbind-impl.jar" location="${main.lib}/jaxb-impl-2.3.2.jar"/>
- <property name="main.xmlbind-impl.url"
- value="${repository.m2}/maven2/com/sun/xml/bind/jaxb-impl/2.3.2/jaxb-impl-2.3.2.jar"/>
- <property name="main.xmlbind-core.jar" location="${main.lib}/jaxb-core-2.3.0.1.jar"/>
- <property name="main.xmlbind-core.url"
- value="${repository.m2}/maven2/com/sun/xml/bind/jaxb-core/2.3.0.1/jaxb-core-2.3.0.1.jar"/>
- <property name="main.activation.jar" location="${main.lib}/activation-1.1.1.jar"/>
- <property name="main.activation.url"
- value="${repository.m2}/maven2/javax/activation/activation/1.1.1/activation-1.1.1.jar"/>
- <property name="main.com.zaxxer.jar" location="${main.lib}/SparseBitSet-1.2.jar"/>
- <property name="main.com.zaxxer.url"
- value="${repository.m2}/maven2/com/zaxxer/SparseBitSet/1.2/SparseBitSet-1.2.jar"/>
-
- <!-- xml signature libs -->
- <property name="dsig.xmlsec.jar" location="${compile.lib}/xmlsec-2.1.5.jar"/>
- <property name="dsig.xmlsec.url" value="${repository.m2}/maven2/org/apache/santuario/xmlsec/2.1.5/xmlsec-2.1.5.jar"/>
- <property name="dsig.bouncycastle-prov.jar" location="${compile.lib}/bcprov-ext-jdk15on-1.65.jar"/>
- <property name="dsig.bouncycastle-prov.url" value="${repository.m2}/maven2/org/bouncycastle/bcprov-ext-jdk15on/1.65/bcprov-ext-jdk15on-1.65.jar"/>
- <property name="dsig.bouncycastle-pkix.jar" location="${compile.lib}/bcpkix-jdk15on-1.65.jar"/>
- <property name="dsig.bouncycastle-pkix.url" value="${repository.m2}/maven2/org/bouncycastle/bcpkix-jdk15on/1.65/bcpkix-jdk15on-1.65.jar"/>
- <property name="dsig.sl4j-api.jar" location="${compile.lib}/slf4j-api-1.7.30.jar"/>
- <property name="dsig.sl4j-api.url" value="${repository.m2}/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/>
+ <dependency prefix="main.commons-logging" artifact="commons-logging:commons-logging:1.2" usage="main"/>
+ <dependency prefix="main.commons-codec" artifact="commons-codec:commons-codec:1.14" usage="main"/>
+ <dependency prefix="main.log4j" artifact="log4j:log4j:1.2.17" usage="main"/>
+ <dependency prefix="main.commons-collections4" artifact="org.apache.commons:commons-collections4:4.4" usage="main"/>
+ <dependency prefix="main.commons-math3" artifact="org.apache.commons:commons-math3:3.6.1" usage="main"/>
+ <dependency prefix="main.com.zaxxer" artifact="com.zaxxer:SparseBitSet:1.2" usage="main"/>
+
+ <dependency prefix="main.junit" artifact="junit:junit:4.13" usage="main-tests"/>
+ <dependency prefix="main.jmh" artifact="org.openjdk.jmh:jmh-core:1.19" usage="main-tests"/>
+ <dependency prefix="main.jmhAnnotation" artifact="org.openjdk.jmh:jmh-generator-annprocess:1.19" usage="main-tests"/>
+ <dependency prefix="main.hamcrest" artifact="org.hamcrest:hamcrest-core:1.3" usage="main-tests"/>
+ <dependency prefix="main.xmlunit" artifact="org.xmlunit:xmlunit-core:2.5.1" usage="main-tests"/>
+ <dependency prefix="main.mockito" artifact="org.mockito:mockito-core:3.2.4" usage="main-tests"/>
+ <dependency prefix="main.byte-buddy" artifact="net.bytebuddy:byte-buddy:1.10.1" usage="main-tests"/>
+ <dependency prefix="main.byte-buddy-agent" artifact="net.bytebuddy:byte-buddy-agent:1.10.1" usage="main-tests"/>
+ <dependency prefix="main.objenesis" artifact="org.objenesis:objenesis:2.6" usage="main-tests"/>
+
+ <dependency prefix="main.ant" artifact="org.apache.ant:ant:1.10.1" usage="excelant"/>
+ <dependency prefix="main.antlauncher" artifact="org.apache.ant:ant-launcher:1.10.1" usage="excelant"/>
+
+ <!-- xml signature libs - not part of the distribution -->
+ <dependency prefix="dsig.xmlsec" artifact="org.apache.santuario:xmlsec:2.1.5" usage="ooxml-provided"/>
+ <dependency prefix="dsig.bouncycastle-prov" artifact="org.bouncycastle:bcprov-ext-jdk15on:1.65" usage="ooxml-provided"/>
+ <dependency prefix="dsig.bouncycastle-pkix" artifact="org.bouncycastle:bcpkix-jdk15on:1.65" usage="ooxml-provided"/>
+ <dependency prefix="dsig.sl4j-api" artifact="org.slf4j:slf4j-api:1.7.30" usage="ooxml-provided"/>
<!-- svg/batik libs - not part of the distribution -->
- <property name="svg.batik-all.url" value="${repository.m2}/maven2/org/apache/xmlgraphics/batik-all/1.12/batik-all-1.12.jar"/>
- <property name="svg.batik-all.jar" value="${compile.lib}/batik-all-1.12.jar"/>
- <property name="svg.xml-apis-ext.url" value="${repository.m2}/maven2/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04.jar"/>
- <property name="svg.xml-apis-ext.jar" value="${compile.lib}/xml-apis-ext-1.3.04.jar"/>
- <property name="svg.xmlgraphics-commons.url" value="${repository.m2}/maven2/org/apache/xmlgraphics/xmlgraphics-commons/2.3/xmlgraphics-commons-2.3.jar"/>
- <property name="svg.xmlgraphics-commons.jar" value="${compile.lib}/xmlgraphics-commons-2.3.jar"/>
+ <dependency prefix="svg.xml-apis-ext" artifact="xml-apis:xml-apis-ext:1.3.04" usage="ooxml-provided"/>
+ <dependency prefix="svg.xmlgraphics-commons" artifact="org.apache.xmlgraphics:xmlgraphics-commons:2.3" usage="ooxml-provided"/>
+ <dependency prefix="svg.batik-all" artifact="org.apache.xmlgraphics:batik-all:1.12" usage="ooxml-provided"/>
<!-- jars in the ooxml-lib directory, see the fetch-ooxml-jars target-->
- <property name="ooxml.curvesapi.jar" location="${ooxml.lib}/curvesapi-1.06.jar"/>
- <property name="ooxml.curvesapi.url"
- value="${repository.m2}/maven2/com/github/virtuald/curvesapi/1.06/curvesapi-1.06.jar"/>
- <property name="ooxml.xmlbeans.jar" location="${ooxml.lib}/xmlbeans-3.1.0.jar"/>
- <property name="ooxml.xmlbeans.url"
- value="https://repository.apache.org/content/repositories/releases/org/apache/xmlbeans/xmlbeans/3.1.0/xmlbeans-3.1.0.jar"/>
- <property name="ooxml.commons-compress.jar" location="${main.lib}/commons-compress-1.20.jar"/>
- <property name="ooxml.commons-compress.url"
- value="${repository.m2}/maven2/org/apache/commons/commons-compress/1.20/commons-compress-1.20.jar"/>
+ <dependency prefix="ooxml.curvesapi" artifact="com.github.virtuald:curvesapi:1.06" usage="ooxml"/>
+ <dependency prefix="ooxml.xmlbeans" artifact="org.apache.xmlbeans:xmlbeans:3.1.0" usage="ooxml"/>
+ <dependency prefix="ooxml.commons-compress" artifact="org.apache.commons:commons-compress:1.20" usage="ooxml"/>
<!-- jars in the ooxml-test-lib directory, see the fetch-ooxml-jars target-->
- <property name="ooxml.test.reflections.jar" location="${ooxml.test.lib}/reflections.jar"/>
- <property name="ooxml.test.reflections.url"
- value="${repository.m2}/maven2/org/reflections/reflections/0.9.11/reflections-0.9.11.jar"/>
- <property name="ooxml.test.guava.jar" location="${ooxml.test.lib}/guava.jar"/>
- <property name="ooxml.test.guava.url"
- value="${repository.m2}/maven2/com/google/guava/guava/20.0/guava-20.0.jar"/>
- <property name="ooxml.test.javassist.jar" location="${ooxml.test.lib}/javassist.jar"/>
- <property name="ooxml.test.javassist.url"
- value="${repository.m2}/maven2/org/javassist/javassist/3.21.0-GA/javassist-3.21.0-GA.jar"/>
+ <dependency prefix="ooxml.test.reflections" artifact="org.reflections:reflections:0.9.11" usage="ooxml-tests"/>
+ <dependency prefix="ooxml.test.guava" artifact="com.google.guava:guava:20.0" usage="ooxml-tests"/>
+ <dependency prefix="ooxml.test.javassist" artifact="org.javassist:javassist:3.21.0-GA" usage="ooxml-tests"/>
<!-- coverage libs -->
- <property name="jacoco.zip" location="${main.lib}/jacoco-0.8.5.zip"/>
- <property name="jacoco.url" value="${repository.m2}/maven2/org/jacoco/jacoco/0.8.5/jacoco-0.8.5.zip"/>
- <property name="asm.jar" location="${main.lib}/asm-7.2.jar"/>
- <property name="asm.url" value="${repository.m2}/maven2/org/ow2/asm/asm/7.2/asm-7.2.jar"/>
- <property name="asmcommons.jar" location="${main.lib}/asm-commons-7.2.jar"/>
- <property name="asmcommons.url" value="${repository.m2}/maven2/org/ow2/asm/asm-commons/7.2/asm-commons-7.2.jar"/>
- <property name="asmtree.jar" location="${main.lib}/asm-tree-7.2.jar"/>
- <property name="asmtree.url" value="${repository.m2}/maven2/org/ow2/asm/asm-tree/7.2/asm-tree-7.2.jar"/>
+ <dependency prefix="jacoco" artifact="org.jacoco:jacoco:0.8.5" usage="util" packaging="zip"/>
+ <dependency prefix="asm" artifact="org.ow2.asm:asm:7.2" usage="util"/>
+ <dependency prefix="asmcommons" artifact="org.ow2.asm:asm-commons:7.2" usage="util"/>
+ <dependency prefix="asmtree" artifact="org.ow2.asm:asm-tree:7.2" usage="util"/>
<!-- license and api checks -->
- <property name="rat.jar" location="${main.lib}/apache-rat-0.12.jar"/>
- <property name="rat.url" value="${repository.m2}/maven2/org/apache/rat/apache-rat/0.12/apache-rat-0.12.jar"/>
- <property name="forbidden.jar" location="${main.lib}/forbiddenapis-2.6.jar"/>
- <property name="forbidden.url" value="${repository.m2}/maven2/de/thetaphi/forbiddenapis/2.6/forbiddenapis-2.6.jar"/>
+ <dependency prefix="rat" artifact="org.apache.rat:apache-rat:0.12" usage="util"/>
+ <dependency prefix="forbidden" artifact="de.thetaphi:forbiddenapis:2.6" usage="util"/>
<property name="maven.ooxml.xsds.version.id" value="1.4"/>
<!-- See https://www.ecma-international.org/publications/standards/Ecma-376.htm -->
<!-- "Copy these file(s), free of charge" -->
- <property name="ooxml.xsds.ozip.1" value="OfficeOpenXML-Part4.zip"/>
- <property name="ooxml.xsds.izip.1" value="OfficeOpenXML-XMLSchema.zip"/>
- <property name="ooxml.xsds.url.1"
- value="https://www.ecma-international.org/publications/files/ECMA-ST/Office%20Open%20XML%201st%20edition%20Part%204%20(PDF).zip"/>
+ <property name="ooxml.xsds.izip.1" value="${basedir}/src/ooxml/resources/org/apache/poi/schemas/OfficeOpenXML-XMLSchema.zip"/>
<property name="ooxml.xsds.src.dir" location="build/ooxml-xsds-src"/>
<property name="ooxml.xsds.src.jar" location="${ooxml.lib}/ooxml-schemas-${maven.ooxml.xsds.version.id}-sources.jar"/>
<property name="ooxml.xsds.jar" location="${ooxml.lib}/ooxml-schemas-${maven.ooxml.xsds.version.id}.jar"/>
<!-- additional schemas are packed into the poi schemas jar, -->
<!-- so we don't have to care about a seperate versioning of the original ooxml schemas -->
- <property name="ooxml.xsds.dsig.1" value="https://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd"/>
- <!-- property name="ooxml.xsds.dsig.2" value="https://uri.etsi.org/01903/v1.3.2/XAdES.xsd"/ -->
- <!-- property name="ooxml.xsds.dsig.3" value="https://uri.etsi.org/01903/v1.4.1/XAdESv141.xsd"/ -->
- <property name="ooxml.xsds.ozip.2" value="OfficeOpenXML-Part2.zip"/>
- <property name="ooxml.xsds.izip.2" value="OpenPackagingConventions-XMLSchema.zip"/>
- <property name="ooxml.xsds.url.2"
- value="https://www.ecma-international.org/publications/files/ECMA-ST/Office%20Open%20XML%201st%20edition%20Part%202%20(PDF).zip"/>
+ <property name="ooxml.xsds.izip.2" value="${basedir}/src/ooxml/resources/org/apache/poi/schemas/OpenPackagingConventions-XMLSchema.zip"/>
<property name="ooxml.security.src.dir" location="build/ooxml-security-src"/>
<property name="ooxml.security.src.jar" location="${ooxml.lib}/ooxml-security-1.1-sources.jar"/>
<property name="ooxml.security.jar" location="${ooxml.lib}/ooxml-security-1.1.jar"/>
@@ -325,35 +292,25 @@ under the License.
<property name="halt.on.test.failure" value="true"/>
<!-- helper jars for pgp signing, building and nexus staging -->
- <property name="dist.bouncycastle-prov.jar" location="${compile.lib}/bcprov-ext-jdk15on-1.65.jar"/>
- <property name="dist.bouncycastle-prov.url" value="${repository.m2}/maven2/org/bouncycastle/bcprov-ext-jdk15on/1.65/bcprov-ext-jdk15on-1.65.jar"/>
- <property name="dist.bouncycastle-bcpg.jar" location="${compile.lib}/bcpg-jdk15on-1.65.jar"/>
- <property name="dist.bouncycastle-bcpg.url" value="${repository.m2}/maven2/org/bouncycastle/bcpg-jdk15on/1.65/bcpg-jdk15on-1.65.jar"/>
- <property name="dist.commons-openpgp.jar" location="${compile.lib}/commons-openpgp-1.0-SNAPSHOT.jar"/>
- <property name="dist.commons-openpgp.url" value="https://repository.apache.org/content/groups/snapshots/org/apache/commons/commons-openpgp/1.0-SNAPSHOT/commons-openpgp-1.0-20190121.221905-12.jar"/>
- <property name="dist.nexus-staging.jar" location="${compile.lib}/nexus-staging-ant-tasks-1.6.3-uber.jar"/>
- <property name="dist.nexus-staging.url" value="${repository.m2}/maven2/org/sonatype/nexus/ant/nexus-staging-ant-tasks/1.6.3/nexus-staging-ant-tasks-1.6.3-uber.jar"/>
+ <dependency prefix="dist.bouncycastle-prov" artifact="org.bouncycastle:bcprov-ext-jdk15on:1.65" usage="util"/>
+ <dependency prefix="dist.bouncycastle-prov" artifact="org.bouncycastle:bcpg-jdk15on:1.65" usage="util"/>
+ <dependency prefix="dist.commons-openpgp" artifact="org.apache.commons:commons-openpgp:1.0-SNAPSHOT" usage="util"
+ repo="https://repository.apache.org/content/groups/snapshots" snapshot="1.0-20190121.221905-12"/>
+ <dependency prefix="dist.nexus-staging" artifact="org.sonatype.nexus.ant:nexus-staging-ant-tasks:1.6.3-uber" usage="util"/>
+
<!-- jars required for maven helper targets -->
- <property name="maven.ant.url" value="${repository.m2}/maven2/org/apache/maven/maven-ant-tasks/2.1.3/maven-ant-tasks-2.1.3.jar"/>
- <property name="maven.ant.jar" value="${compile.lib}/maven-ant-tasks-2.1.3.jar"/>
-
- <property name="dist.svnant.jar" location="${compile.lib}/svnant/svnant-1.3.1.jar"/>
- <property name="dist.svnant.url" value="https://dl.bintray.com/openmeetings/maven/org/tigris/subclipse/svnant/1.3.1/svnant-1.3.1.jar"/>
- <property name="dist.svnclient.jar" location="${compile.lib}/svnant/svnClientAdapter-1.3.1.jar"/>
- <property name="dist.svnclient.url" value="https://dl.bintray.com/openmeetings/maven/org/tigris/subclipse/svnclientadapter/1.3.1//svnclientadapter-1.3.1.jar"/>
- <property name="dist.svnkit.jar" location="${compile.lib}/svnant/svnkit-1.8.11.jar"/>
- <property name="dist.svnkit.url" value="${repository.m2}/maven2/org/tmatesoft/svnkit/svnkit/1.8.11/svnkit-1.8.11.jar"/>
- <property name="dist.svnkit-javahl16.jar" location="${compile.lib}/svnant/svnkit-javahl16-1.8.11.jar"/>
- <property name="dist.svnkit-javahl16.url" value="${repository.m2}/maven2/org/tmatesoft/svnkit/svnkit-javahl16/1.8.11/svnkit-javahl16-1.8.11.jar"/>
- <property name="dist.sqljet.jar" location="${compile.lib}/svnant/sqljet-1.1.10.jar"/>
- <property name="dist.sqljet.url" value="${repository.m2}/maven2/org/tmatesoft/sqljet/sqljet/1.1.10/sqljet-1.1.10.jar"/>
- <property name="dist.antlr.jar" location="${compile.lib}/svnant/antlr-runtime-3.5.2.jar"/>
- <property name="dist.antlr.url" value="${repository.m2}/maven2/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2.jar"/>
- <property name="dist.sequence-library.jar" location="${compile.lib}/svnant/sequence-library-1.0.3.jar"/>
- <property name="dist.sequence-library.url" value="${repository.m2}/maven2/de/regnis/q/sequence/sequence-library/1.0.3/sequence-library-1.0.3.jar"/>
-
- <property name="findbugs.url" value="https://downloads.sourceforge.net/project/findbugs/findbugs/3.0.1/findbugs-noUpdateChecks-3.0.1.zip?download="/>
- <property name="findbugs.jar" location="${main.lib}/findbugs-noUpdateChecks-3.0.1.zip"/>
+ <dependency prefix="maven.ant" artifact="org.apache.maven:maven-ant-tasks:2.1.3" usage="util"/>
+ <dependency prefix="dist.svnant" artifact="org.tigris.subclipse:svnant:1.3.1" usage="util"
+ repo="https://dl.bintray.com/openmeetings/maven"/>
+ <dependency prefix="dist.svnclient" artifact="org.tigris.subclipse:svnclientadapter:1.3.1" usage="util"
+ repo="https://dl.bintray.com/openmeetings/maven"/>
+ <dependency prefix="dist.svnkit" artifact="org.tmatesoft.svnkit:svnkit:1.8.11" usage="util"/>
+ <dependency prefix="dist.svnkit-javahl16" artifact="org.tmatesoft.svnkit:svnkit-javahl16:1.8.11" usage="util"/>
+ <dependency prefix="dist.sqljet" artifact="org.tmatesoft.svnkit:sqljet:1.1.10" usage="util"/>
+ <dependency prefix="dist.antlr" artifact="org.antlr:antlr-runtime:3.5.2" usage="util"/>
+ <dependency prefix="dist.sequence-library" artifact="de.regnis.q.sequence:sequence-library:1.0.3" usage="util"/>
+ <dependency prefix="findbugs" artifact="findbugs:findbugs:3.0.1" usage="util"
+ repo="https://downloads.sourceforge.net/project" snapshot="noUpdateChecks-3.0.1" query="?download="/>
<propertyset id="junit.properties">
<propertyref name="POI.testdata.path"/>
@@ -377,10 +334,6 @@ under the License.
<pathelement location="${main.commons-codec.jar}"/>
<pathelement location="${main.commons-collections4.jar}"/>
<pathelement location="${main.commons-math3.jar}"/>
- <pathelement location="${main.xmlbind.jar}"/>
- <pathelement location="${main.xmlbind-impl.jar}"/>
- <pathelement location="${main.xmlbind-core.jar}"/>
- <pathelement location="${main.activation.jar}"/>
<pathelement location="${main.com.zaxxer.jar}"/>
</path>
@@ -548,7 +501,7 @@ under the License.
</path>
<path id="lib.jacoco">
- <fileset dir="lib">
+ <fileset dir="${util.lib}">
<include name="org.jacoco*.jar" />
<include name="asm-*.jar" />
</fileset>
@@ -629,6 +582,9 @@ under the License.
<attribute name="src"/>
<attribute name="dest"/>
<sequential>
+ <local name="destdir"/>
+ <dirname property="destdir" file="@{dest}"/>
+ <mkdir dir="${destdir}"/>
<get src="@{src}" dest="@{dest}" skipexisting="true"/>
</sequential>
</macrodef>
@@ -637,102 +593,11 @@ under the License.
<!-- remove previous versions of third-party jars to prevent them from lingering around,
we often had hard-to-find build/CI-problems because of these! -->
<mkdir dir="${main.lib}"/>
- <mkdir dir="${compile.lib}"/>
<mkdir dir="${ooxml.lib}"/>
- <mkdir dir="${ooxml.test.lib}"/>
+ <mkdir dir="${ooxml-tests.lib}"/>
<delete verbose="true">
- <fileset dir="${main.lib}">
- <include name="ant-1.8*"/>
- <include name="ant-1.9.4*"/>
- <include name="ant-launcher-1.9.4*"/>
- <include name="asm-all-4*"/>
- <include name="asm-all-5.0.3*"/>
- <include name="asm-all-5.2*"/>
- <include name="asm*-6.*"/>
- <include name="asm*-7.0.*"/>
- <include name="commons-codec-1.5*"/>
- <include name="commons-codec-1.9*"/>
- <include name="commons-codec-1.10*"/>
- <include name="commons-codec-1.11*"/>
- <include name="commons-codec-1.12*"/>
- <include name="commons-codec-1.13*"/>
- <include name="commons-compress-1.1*"/>
- <include name="commons-collections4-4.1*"/>
- <include name="commons-collections4-4.2*"/>
- <include name="commons-collections4-4.3*"/>
- <include name="commons-logging-1.1*.jar"/>
- <include name="findbugs-noUpdateChecks-2.0.3*"/>
- <include name="jacoco-0.6*"/>
- <include name="jacoco-0.7*"/>
- <include name="jacoco-0.8.1*"/>
- <include name="jacoco-0.8.2*"/>
- <include name="jacoco-0.8.3*"/>
- <include name="jmh-core-1.15*"/>
- <include name="jmh-generator-annprocess-1.15*"/>
- <include name="log4j-1.2.13*"/>
- <include name="org.jacoco.*-0.6*"/>
- <include name="org.jacoco.*-0.7**"/>
- <include name="org.jacoco.*-0.8.1*"/>
- <include name="org.jacoco.*-0.8.2*"/>
- <include name="org.jacoco.*-0.8.3*"/>
- <include name="dom4j*"/>
- <include name="apache-rat-0.10*"/>
- <include name="xercesImpl-*.jar"/>
- <include name="junit-3*"/>
- <include name="junit-4.11*"/>
- <include name="junit-4.12*"/>
- <include name="forbiddenapis-1.*.jar"/>
- <include name="forbiddenapis-2.0.jar"/>
- <include name="forbiddenapis-2.1.jar"/>
- <include name="forbiddenapis-2.3.jar"/>
- <include name="forbiddenapis-2.5.jar"/>
- <include name="apache-rat-0.11.jar"/>
- <include name="mockito-core-2*.jar"/>
- <include name="mockito-core-3.0*.jar"/>
- <include name="byte-buddy-*1.7*.jar"/>
- <include name="byte-buddy-*1.9*.jar"/>
- <include name="jaxb-api-2.3.0.jar"/>
- <include name="jaxb-impl-2.3.0.1.jar"/>
- </fileset>
- <fileset dir="${ooxml.lib}">
- <!-- remove jars from previous versions, but not the current version -->
- <include name="ooxml-schemas-1.0-sources.jar"/>
- <include name="ooxml-schemas-1.0.jar"/>
- <include name="ooxml-schemas-src-1.1.jar"/>
- <include name="ooxml-schemas-1.1-sources.jar"/>
- <include name="ooxml-schemas-1.1.jar"/>
- <include name="ooxml-schemas-1.2-sources.jar"/>
- <include name="ooxml-schemas-1.2.jar"/>
- <include name="ooxml-schemas-1.3-sources.jar"/>
- <include name="ooxml-schemas-1.3.jar"/>
- <include name="ooxml-security-1.0-sources.jar"/>
- <include name="ooxml-security-1.0.jar"/>
- <include name="curvesapi-1.03.jar"/>
- <include name="curvesapi-1.04.jar"/>
- <include name="curvesapi-1.05.jar"/>
- <include name="xmlbeans-2.*.jar"/>
- <include name="xmlbeans-3.0*.jar"/>
- </fileset>
- <fileset dir="${compile.lib}">
- <include name="xercesImpl-*.jar"/>
- <include name="xmlsec-2.0*.jar"/>
- <include name="xmlsec-2.1.0.jar"/>
- <include name="xmlsec-2.1.1.jar"/>
- <include name="xmlsec-2.1.2.jar"/>
- <include name="xmlsec-2.1.3.jar"/>
- <include name="xmlsec-2.1.4.jar"/>
- <include name="bc*jdk15on-1.5*.jar"/>
- <include name="bc*jdk15on-1.60*.jar"/>
- <include name="bc*jdk15on-1.61*.jar"/>
- <include name="bc*jdk15on-1.62*.jar"/>
- <include name="bc*jdk15on-1.63*.jar"/>
- <include name="bc*jdk15on-1.64*.jar"/>
- <include name="batik-all-1.10.jar"/>
- <include name="batik-all-1.11.jar"/>
- <include name="slf4j-api-1.7.7.jar"/>
- <include name="slf4j-api-1.7.1*.jar"/>
- <include name="slf4j-api-1.7.2*.jar"/>
- </fileset>
+ <fileset dir="${basedir}/lib" includes="*.jar"/>
+ <!-- remove jars from previous versions, but not the current version -->
</delete>
<condition property="jars.present">
@@ -764,14 +629,10 @@ under the License.
<available file="${dsig.sl4j-api.jar}"/>
<available file="${main.commons-collections4.jar}"/>
<available file="${main.commons-math3.jar}"/>
- <available file="${main.xmlbind.jar}"/>
- <available file="${main.xmlbind-impl.jar}"/>
- <available file="${main.xmlbind-core.jar}"/>
- <available file="${main.activation.jar}"/>
<available file="${main.com.zaxxer.jar}"/>
<!-- we had some CI failures when the extracted files for JaCoCo were missing somehow... -->
- <available file="${main.lib}/jacocoagent.jar"/>
+ <available file="${util.lib}/jacocoagent.jar"/>
</and>
<isset property="disconnected"/>
</or>
@@ -801,15 +662,12 @@ under the License.
<downloadfile src="${jacoco.url}" dest="${jacoco.zip}"/>
<downloadfile src="${main.commons-collections4.url}" dest="${main.commons-collections4.jar}"/>
<downloadfile src="${main.commons-math3.url}" dest="${main.commons-math3.jar}"/>
- <downloadfile src="${main.xmlbind.url}" dest="${main.xmlbind.jar}"/>
- <downloadfile src="${main.xmlbind-impl.url}" dest="${main.xmlbind-impl.jar}"/>
- <downloadfile src="${main.xmlbind-core.url}" dest="${main.xmlbind-core.jar}"/>
- <downloadfile src="${main.activation.url}" dest="${main.activation.jar}"/>
<downloadfile src="${main.com.zaxxer.url}" dest="${main.com.zaxxer.jar}"/>
- <unzip src="${jacoco.zip}" dest=".">
+ <unzip src="${jacoco.zip}" dest="${util.lib}">
<patternset>
<include name="lib/*.jar"/>
</patternset>
+ <mapper type="flatten"/>
</unzip>
<downloadfile src="${rat.url}" dest="${rat.jar}"/>
<downloadfile src="${forbidden.url}" dest="${forbidden.jar}"/>
@@ -839,7 +697,7 @@ under the License.
</target>
<target name="fetch-ooxml-jars" depends="check-ooxml-jars" unless="ooxml.jars.present">
<mkdir dir="${ooxml.lib}"/>
- <mkdir dir="${ooxml.test.lib}"/>
+ <mkdir dir="${ooxml-tests.lib}"/>
<downloadfile src="${ooxml.curvesapi.url}" dest="${ooxml.curvesapi.jar}"/>
<downloadfile src="${ooxml.xmlbeans.url}" dest="${ooxml.xmlbeans.jar}"/>
<downloadfile src="${ooxml.commons-compress.url}" dest="${ooxml.commons-compress.jar}"/>
@@ -867,7 +725,6 @@ under the License.
</condition>
</target>
<target name="fetch-svn-jars" depends="check-svn-jars" unless="svn.jars.present">
- <mkdir dir="${compile.lib}/svnant"/>
<downloadfile src="${dist.svnant.url}" dest="${dist.svnant.jar}"/>
<downloadfile src="${dist.svnclient.url}" dest="${dist.svnclient.jar}"/>
<downloadfile src="${dist.svnkit.url}" dest="${dist.svnkit.jar}"/>
@@ -877,53 +734,14 @@ under the License.
<downloadfile src="${dist.sequence-library.url}" dest="${dist.sequence-library.jar}"/>
</target>
- <target name="check-ooxml-xsds">
- <condition property="ooxml-xsds.present">
- <or>
- <and>
- <available file="${ooxml.lib}/${ooxml.xsds.izip.1}"/>
- <available file="${ooxml.lib}/${ooxml.xsds.izip.2}"/>
- </and>
- <isset property="disconnected"/>
- </or>
- </condition>
- </target>
- <target name="fetch-ooxml-xsds" unless="ooxml-xsds.present"
- depends="check-ooxml-xsds"
- description="Fetches needed OOXML xsd files from the Internet">
- <get dest="${ooxml.lib}" skipexisting="true">
- <url url="${ooxml.xsds.url.1}"/>
- <url url="${ooxml.xsds.url.2}"/>
- <url url="${ooxml.xsds.dsig.1}"/>
- <!--url url="${ooxml.xsds.dsig.2}"/ -->
- <!--url url="${ooxml.xsds.dsig.3}"/ -->
- <chainedmapper>
- <flattenmapper/>
- <firstmatchmapper>
- <globmapper from="Office%20Open%20XML%201st%20edition%20Part%20*%20(PDF).zip" to="OfficeOpenXML-Part*.zip"/>
- <identitymapper/>
- </firstmatchmapper>
- </chainedmapper>
- </get>
- <unzip src="${ooxml.lib}/${ooxml.xsds.ozip.1}" dest="${ooxml.lib}">
- <fileset dir="${ooxml.lib}" includes="OfficeOpenXML-Part*.zip"/>
- <patternset>
- <include name="${ooxml.xsds.izip.1}"/>
- <include name="${ooxml.xsds.izip.2}"/>
- </patternset>
- </unzip>
- </target>
- <target name="check-compiled-ooxml-xsds" depends="fetch-ooxml-xsds">
+ <target name="check-compiled-ooxml-xsds">
<condition property="ooxml-compiled-xsds.present">
- <or>
- <and>
- <available file="${ooxml.xsds.jar}"/>
- <available file="${ooxml.security.jar}"/>
- <available file="${ooxml.xsds.src.jar}"/>
- <available file="${ooxml.security.src.jar}"/>
- </and>
- <isset property="disconnected"/>
- </or>
+ <and>
+ <available file="${ooxml.xsds.jar}"/>
+ <available file="${ooxml.xsds.src.jar}"/>
+ <available file="${ooxml.security.jar}"/>
+ <available file="${ooxml.security.src.jar}"/>
+ </and>
</condition>
</target>
@@ -932,6 +750,8 @@ under the License.
<attribute name="sources-jar"/>
<attribute name="noupa" default="false"/>
<attribute name="nopvr" default="false"/>
+ <attribute name="multi-src"/>
+ <attribute name="typesystemname"/>
<element name="xsds"/>
<sequential>
<!-- We need a fair amount of memory to compile the xml schema, -->
@@ -948,6 +768,7 @@ under the License.
<property name="xmlbean.xsds.dir" location="build/xmlbean-xsds"/>
<property name="xmlbean.sources.dir" location="build/xmlbean-sources"/>
<property name="xmlbean.classes.dir" location="build/xmlbean-classes"/>
+
<delete dir="${xmlbean.xsds.dir}"/>
<mkdir dir="${xmlbean.xsds.dir}"/>
<delete dir="${xmlbean.sources.dir}"/>
@@ -972,12 +793,12 @@ under the License.
memoryMaximumSize="${ooxml.memory}"
noupa="@{noupa}"
nopvr="@{nopvr}"
+ typesystemname="@{typesystemname}"
>
<classpath>
<path location="${ooxml.xmlbeans.jar}"/>
</classpath>
</xmlbean>
-
<local name="loaderMethod"/>
<!-- the space between "public static" is on purpose to prevent double execution -->
<property name="loaderMethod"><![CDATA[
@@ -993,7 +814,6 @@ under the License.
}
public static \2 newInstance\(\) \{]]></property>
-
<replaceregexp byline="true" match="(\s*)public static ([^ ]+) newInstance\(\) \{" replace="${loaderMethod}">
<fileset dir="${xmlbean.sources.dir}" includes="**/*.java" excludes="**/impl/**"/>
</replaceregexp>
@@ -1020,16 +840,43 @@ under the License.
optimize="true"
memoryMaximumSize="${ooxml.memory}"
includeantruntime="false">
- <!-- debug="${compile.debug}" -->
<classpath refid="ooxml.classpath"/>
</javac>
+ <local name="module-package"/>
+ <loadfile property="module-package" srcFile="@{multi-src}/java9/module-info.java">
+ <filterchain>
+ <containsregex pattern=".*module ([^ ]+).*" replace="\1" flags="i"/>
+ <striplinebreaks/>
+ </filterchain>
+ </loadfile>
+
+ <mkdir dir="${xmlbean.classes.dir}/META-INF/versions/9"/>
+
+ <javac release="9"
+ srcdir="@{multi-src}/java9"
+ destdir="${xmlbean.classes.dir}/META-INF/versions/9"
+ includeantruntime="false"
+ fork="true"
+ modulepath="${ooxml.lib}"
+ unless:true="${isJava8}">
+ <compilerarg line="--patch-module ${module-package}=${xmlbean.classes.dir}"/>
+ </javac>
+
+ <delete file="@{classes-jar}"/>
+ <delete file="@{sources-jar}"/>
+
<jar destfile="@{classes-jar}" level="9">
<fileset dir="${xmlbean.classes.dir}" excludes="org/apache/**"/>
+ <zipfileset prefix="META-INF/versions/9/" dir="@{multi-src}/java9" includes="**/*.class" if:true="${isJava8}"/>
<metainf dir="legal"/>
+ <manifest>
+ <attribute name="Multi-Release" value="true"/>
+ </manifest>
</jar>
<jar destfile="@{sources-jar}" level="9">
<fileset dir="${xmlbean.sources.dir}" excludes="org/apache/**"/>
+ <zipfileset prefix="META-INF/versions/9/" dir="@{multi-src}/java9" excludes="**/*.class"/>
<metainf dir="legal"/>
</jar>
@@ -1040,23 +887,34 @@ under the License.
</sequential>
</macrodef>
- <target name="compile-ooxml-xsds" unless="ooxml-compiled-xsds.present"
+ <target name="compile-ooxml-xsds"
depends="init,check-compiled-ooxml-xsds"
+ unless="ooxml-compiled-xsds.present"
description="Unpacks the OOXML xsd files, and compiles them into XmlBeans">
- <compile-ooxml-xmlbean classes-jar="${ooxml.xsds.jar}" sources-jar="${ooxml.xsds.src.jar}">
+ <compile-ooxml-xmlbean
+ classes-jar="${ooxml.xsds.jar}"
+ sources-jar="${ooxml.xsds.src.jar}"
+ multi-src="${basedir}/src/multimodule/ooxml-schemas"
+ typesystemname="OoxmlSchemas"
+ >
<xsds>
- <zipfileset src="${ooxml.lib}/${ooxml.xsds.izip.1}"/>
+ <zipfileset src="${ooxml.xsds.izip.1}"/>
<fileset dir="${ooxml.visio.xsd.dir}"/>
- <fileset dir="${ooxml.schema.xsdconfig.dir}" excludes="XAdES*.xsd"/>
+ <fileset dir="${ooxml.schema.xsdconfig.dir}" includes="ooxmlSchemas.xsdconfig,markup-compatibility.xsd"/>
</xsds>
</compile-ooxml-xmlbean>
+
<!-- Now do the same for the security schemas -->
- <compile-ooxml-xmlbean classes-jar="${ooxml.security.jar}" sources-jar="${ooxml.security.src.jar}">
+ <compile-ooxml-xmlbean
+ classes-jar="${ooxml.security.jar}"
+ sources-jar="${ooxml.security.src.jar}"
+ multi-src="${basedir}/src/multimodule/ooxml-security"
+ typesystemname="OoxmlSecurity"
+ >
<xsds>
- <zipfileset src="${ooxml.lib}/${ooxml.xsds.izip.2}" includes="opc-digSig.xsd,opc-relationships.xsd"/>
- <fileset dir="${ooxml.lib}" includes="xmldsig*.xsd"/>
+ <zipfileset src="${ooxml.xsds.izip.2}" includes="opc-digSig.xsd,opc-relationships.xsd"/>
<fileset dir="${ooxml.security.xsd.dir}"/>
- <fileset dir="${ooxml.schema.xsdconfig.dir}" includes="XAdES*.xsd,*.xsdconfig"/>
+ <fileset dir="${ooxml.schema.xsdconfig.dir}" includes="XAdES*.xsd,*.xsdconfig,xmldsig*.xsd"/>
</xsds>
</compile-ooxml-xmlbean>
</target>
@@ -1095,42 +953,22 @@ under the License.
<copy todir="${main.output.dir}">
<fileset dir="${main.resource1.dir}"/>
</copy>
- </target>
- <target name="generate-geometry" depends="fetch-ooxml-xsds" if="ignoreme">
- <delete dir="${geometry.output.tmpdir}"/>
- <unzip src="${ooxml.lib}/${ooxml.xsds.izip.1}" dest="${geometry.output.tmpdir}"/>
- <exec executable="${env.JAVA_HOME}/bin/xjc">
- <arg value="-p"/>
- <arg value="${geometry.pkg}"/>
- <arg value="-b"/>
- <arg file="src/types/definitions/dml-shapeGeometry.xjb"/>
- <arg value="-readOnly"/>
- <arg value="-no-header"/>
- <!--arg value="-npa"/ -->
- <!--arg value="-mark-generated"/ -->
- <!--arg value="-Xlocator"/ -->
- <arg file="${geometry.output.tmpdir}/dml-shapeGeometry.xsd"/>
- <arg value="-d"/>
- <arg file="${geometry.output.tmpdir}"/>
- </exec>
- <copy file="src/java/org/apache/poi/POIDocument.java" tofile="${geometry.output.tmpdir}/apache-license.txt">
- <filterchain>
- <headfilter lines="16"/>
- </filterchain>
- </copy>
- <copy todir="${main.src}">
- <fileset dir="${geometry.output.tmpdir}" includes="**/*.java"/>
- <filterchain>
- <concatfilter prepend="${geometry.output.tmpdir}/apache-license.txt"/>
- <!-- fix javadocs for java 8 doclint -->
- <replaceregex pattern="&amp;lt;(.*)>" replace="&amp;lt;\1&amp;gt;" flags="g"/>
- <fixcrlf eol="lf"/>
- </filterchain>
- </copy>
+
+ <mkdir dir="${main.output.dir}/META-INF/versions/9"/>
+
+ <javac release="9"
+ srcdir="${basedir}/src/multimodule/poi/java9"
+ destdir="${main.output.dir}/META-INF/versions/9"
+ includeantruntime="false"
+ fork="true"
+ modulepath="${main.lib}"
+ unless:true="${isJava8}">
+ <compilerarg line="--patch-module org.apache.poi.poi=${main.output.dir}"/>
+ </javac>
</target>
- <target name="compile-scratchpad" depends="compile-main,generate-geometry">
+ <target name="compile-scratchpad" depends="compile-main">
<!-- compile the sources -->
<javac target="${jdk.version.class}"
source="${jdk.version.source}"
@@ -1983,6 +1821,11 @@ under the License.
</sequential>
</macrodef>
+ <target name="bla" depends="compile-main, compile-version, -manifest">
+ <maven-jar src="${main.output.dir}"/>
+ </target>
+
+
<target name="jar" depends="compile, compile-version, compile-ooxml-lite, -manifest" description="Creates jar files for distribution">
<maven-jar src="${main.output.dir}"/>
<maven-jar src="${scratchpad.output.dir}"/>
@@ -2235,6 +2078,8 @@ under the License.
<exclude name="resources/ooxml/org/apache/poi/xssf/usermodel/presetTableStyles.xml" />
<exclude name="ooxml/resources/org/apache/poi/xdgf/visio.xsd" />
<exclude name="ooxml/resources/org/apache/poi/schemas/XAdES*.xsd" />
+ <exclude name="ooxml/resources/org/apache/poi/schemas/xmldsig-core-schema.xsd" />
+ <exclude name="ooxml/resources/org/apache/poi/schemas/*.zip" />
<exclude name="**/*.iml" />
<exclude name="documentation/resources/images/pb-poi.cdr"/>
<exclude name="scratchpad/models/poi-hdf.zargo"/>
@@ -2366,10 +2211,6 @@ under the License.
<auxClasspath path="${main.jmh.jar}"/>
<auxClasspath path="${main.jmhAnnotation.jar}"/>
<auxClasspath path="${main.ant.jar}" />
- <auxClasspath path="${main.xmlbind.jar}" />
- <auxClasspath path="${main.xmlbind-impl.jar}" />
- <auxClasspath path="${main.xmlbind-core.jar}" />
- <auxClasspath path="${main.activation.jar}" />
<auxClasspath path="${main.com.zaxxer.jar}" />
<auxClasspath path="${svg.batik-all.jar}"/>
<auxClasspath path="${svg.xml-apis-ext.jar}"/>
@@ -2550,7 +2391,13 @@ under the License.
</fail>
<path id="path.svnant">
- <fileset dir="${compile.lib}/svnant" includes="*.jar"/>
+ <pathelement location="${dist.svnant.jar}"/>
+ <pathelement location="${dist.svnclient.jar}"/>
+ <pathelement location="${dist.svnkit.jar}"/>
+ <pathelement location="${dist.svnkit-javahl16.jar}"/>
+ <pathelement location="${dist.sqljet.jar}"/>
+ <pathelement location="${dist.antlr.jar}"/>
+ <pathelement location="${dist.sequence-library.jar}"/>
</path>
<taskdef resource="org/tigris/subversion/svnant/svnantlib.xml" classpathref="path.svnant"/>
@@ -2843,15 +2690,15 @@ under the License.
Doesn't work with Java6 - the https urls can't be accessed via loadChecksum
-->
<target name="update-download">
- <downloadfile src="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/missing-link/ml-ant-http-1.1.3.zip" dest="${compile.lib}/ml-ant-http-1.1.3.zip"/>
- <unzip src="${compile.lib}/ml-ant-http-1.1.3.zip" dest="${compile.lib}">
+ <downloadfile src="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/missing-link/ml-ant-http-1.1.3.zip" dest="${util.lib}/ml-ant-http-1.1.3.zip"/>
+ <unzip src="${util.lib}/ml-ant-http-1.1.3.zip" dest="${util.lib}">
<patternset>
<include name="ml-ant-http-1.1.3.jar"/>
</patternset>
</unzip>
<taskdef name="http" classname="org.missinglink.ant.task.http.HttpClientTask">
<classpath>
- <path location="${compile.lib}/ml-ant-http-1.1.3.jar"/>
+ <path location="${util.lib}/ml-ant-http-1.1.3.jar"/>
</classpath>
</taskdef>
diff --git a/src/java/org/apache/poi/sl/draw/DrawSimpleShape.java b/src/java/org/apache/poi/sl/draw/DrawSimpleShape.java
index 98e8286be8..88b7eea935 100644
--- a/src/java/org/apache/poi/sl/draw/DrawSimpleShape.java
+++ b/src/java/org/apache/poi/sl/draw/DrawSimpleShape.java
@@ -225,7 +225,9 @@ public class DrawSimpleShape extends DrawShape {
break;
case STEALTH:
case ARROW:
- p = new Path(false, true);
+ p = new Path();
+ p.setFill(PaintModifier.NONE);
+ p.setStroke(true);
Path2D.Double arrow = new Path2D.Double();
arrow.moveTo((-lineWidth * scaleX), (-lineWidth * scaleY / 2));
arrow.lineTo(0, 0);
@@ -297,7 +299,9 @@ public class DrawSimpleShape extends DrawShape {
break;
case STEALTH:
case ARROW:
- p = new Path(false, true);
+ p = new Path();
+ p.setFill(PaintModifier.NONE);
+ p.setStroke(true);
Path2D.Double arrow = new Path2D.Double();
arrow.moveTo((lineWidth * scaleX), (-lineWidth * scaleY / 2));
arrow.lineTo(0, 0);
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTAdjustHandleList.java b/src/java/org/apache/poi/sl/draw/binding/CTAdjustHandleList.java
deleted file mode 100644
index 9e62a41d83..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTAdjustHandleList.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_AdjustHandleList complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_AdjustHandleList"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;choice maxOccurs="unbounded" minOccurs="0"&gt;
- * &lt;element name="ahXY" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_XYAdjustHandle"/&gt;
- * &lt;element name="ahPolar" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_PolarAdjustHandle"/&gt;
- * &lt;/choice&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_AdjustHandleList", propOrder = {
- "ahXYOrAhPolar"
-})
-public class CTAdjustHandleList {
-
- @XmlElements({
- @XmlElement(name = "ahXY", type = CTXYAdjustHandle.class),
- @XmlElement(name = "ahPolar", type = CTPolarAdjustHandle.class)
- })
- protected List<Object> ahXYOrAhPolar;
-
- /**
- * Gets the value of the ahXYOrAhPolar property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the ahXYOrAhPolar property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getAhXYOrAhPolar().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link CTXYAdjustHandle }
- * {@link CTPolarAdjustHandle }
- *
- *
- */
- public List<Object> getAhXYOrAhPolar() {
- if (ahXYOrAhPolar == null) {
- ahXYOrAhPolar = new ArrayList<>();
- }
- return this.ahXYOrAhPolar;
- }
-
- public boolean isSetAhXYOrAhPolar() {
- return ((this.ahXYOrAhPolar!= null)&&(!this.ahXYOrAhPolar.isEmpty()));
- }
-
- public void unsetAhXYOrAhPolar() {
- this.ahXYOrAhPolar = null;
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTAngle.java b/src/java/org/apache/poi/sl/draw/binding/CTAngle.java
deleted file mode 100644
index 076c24bf38..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTAngle.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Angle complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_Angle"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;attribute name="val" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Angle" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Angle")
-public class CTAngle {
-
- @XmlAttribute(name = "val", required = true)
- protected int val;
-
- /**
- * Gets the value of the val property.
- *
- */
- public int getVal() {
- return val;
- }
-
- /**
- * Sets the value of the val property.
- *
- */
- public void setVal(int value) {
- this.val = value;
- }
-
- public boolean isSetVal() {
- return true;
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTColor.java b/src/java/org/apache/poi/sl/draw/binding/CTColor.java
deleted file mode 100644
index 0a4c9f364c..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTColor.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Color complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_Color"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;group ref="{http://schemas.openxmlformats.org/drawingml/2006/main}EG_ColorChoice"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Color", propOrder = {
- "scrgbClr",
- "srgbClr",
- "hslClr",
- "sysClr",
- "schemeClr",
- "prstClr"
-})
-public class CTColor {
-
- protected CTScRgbColor scrgbClr;
- protected CTSRgbColor srgbClr;
- protected CTHslColor hslClr;
- protected CTSystemColor sysClr;
- protected CTSchemeColor schemeClr;
- protected CTPresetColor prstClr;
-
- /**
- * Gets the value of the scrgbClr property.
- *
- * @return
- * possible object is
- * {@link CTScRgbColor }
- *
- */
- public CTScRgbColor getScrgbClr() {
- return scrgbClr;
- }
-
- /**
- * Sets the value of the scrgbClr property.
- *
- * @param value
- * allowed object is
- * {@link CTScRgbColor }
- *
- */
- public void setScrgbClr(CTScRgbColor value) {
- this.scrgbClr = value;
- }
-
- public boolean isSetScrgbClr() {
- return (this.scrgbClr!= null);
- }
-
- /**
- * Gets the value of the srgbClr property.
- *
- * @return
- * possible object is
- * {@link CTSRgbColor }
- *
- */
- public CTSRgbColor getSrgbClr() {
- return srgbClr;
- }
-
- /**
- * Sets the value of the srgbClr property.
- *
- * @param value
- * allowed object is
- * {@link CTSRgbColor }
- *
- */
- public void setSrgbClr(CTSRgbColor value) {
- this.srgbClr = value;
- }
-
- public boolean isSetSrgbClr() {
- return (this.srgbClr!= null);
- }
-
- /**
- * Gets the value of the hslClr property.
- *
- * @return
- * possible object is
- * {@link CTHslColor }
- *
- */
- public CTHslColor getHslClr() {
- return hslClr;
- }
-
- /**
- * Sets the value of the hslClr property.
- *
- * @param value
- * allowed object is
- * {@link CTHslColor }
- *
- */
- public void setHslClr(CTHslColor value) {
- this.hslClr = value;
- }
-
- public boolean isSetHslClr() {
- return (this.hslClr!= null);
- }
-
- /**
- * Gets the value of the sysClr property.
- *
- * @return
- * possible object is
- * {@link CTSystemColor }
- *
- */
- public CTSystemColor getSysClr() {
- return sysClr;
- }
-
- /**
- * Sets the value of the sysClr property.
- *
- * @param value
- * allowed object is
- * {@link CTSystemColor }
- *
- */
- public void setSysClr(CTSystemColor value) {
- this.sysClr = value;
- }
-
- public boolean isSetSysClr() {
- return (this.sysClr!= null);
- }
-
- /**
- * Gets the value of the schemeClr property.
- *
- * @return
- * possible object is
- * {@link CTSchemeColor }
- *
- */
- public CTSchemeColor getSchemeClr() {
- return schemeClr;
- }
-
- /**
- * Sets the value of the schemeClr property.
- *
- * @param value
- * allowed object is
- * {@link CTSchemeColor }
- *
- */
- public void setSchemeClr(CTSchemeColor value) {
- this.schemeClr = value;
- }
-
- public boolean isSetSchemeClr() {
- return (this.schemeClr!= null);
- }
-
- /**
- * Gets the value of the prstClr property.
- *
- * @return
- * possible object is
- * {@link CTPresetColor }
- *
- */
- public CTPresetColor getPrstClr() {
- return prstClr;
- }
-
- /**
- * Sets the value of the prstClr property.
- *
- * @param value
- * allowed object is
- * {@link CTPresetColor }
- *
- */
- public void setPrstClr(CTPresetColor value) {
- this.prstClr = value;
- }
-
- public boolean isSetPrstClr() {
- return (this.prstClr!= null);
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTColorMRU.java b/src/java/org/apache/poi/sl/draw/binding/CTColorMRU.java
deleted file mode 100644
index efcc1e25dc..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTColorMRU.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_ColorMRU complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_ColorMRU"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;group ref="{http://schemas.openxmlformats.org/drawingml/2006/main}EG_ColorChoice" maxOccurs="10" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_ColorMRU", propOrder = {
- "egColorChoice"
-})
-public class CTColorMRU {
-
- @XmlElements({
- @XmlElement(name = "scrgbClr", type = CTScRgbColor.class),
- @XmlElement(name = "srgbClr", type = CTSRgbColor.class),
- @XmlElement(name = "hslClr", type = CTHslColor.class),
- @XmlElement(name = "sysClr", type = CTSystemColor.class),
- @XmlElement(name = "schemeClr", type = CTSchemeColor.class),
- @XmlElement(name = "prstClr", type = CTPresetColor.class)
- })
- protected List<Object> egColorChoice;
-
- /**
- * Gets the value of the egColorChoice property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the egColorChoice property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getEGColorChoice().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link CTScRgbColor }
- * {@link CTSRgbColor }
- * {@link CTHslColor }
- * {@link CTSystemColor }
- * {@link CTSchemeColor }
- * {@link CTPresetColor }
- *
- *
- */
- public List<Object> getEGColorChoice() {
- if (egColorChoice == null) {
- egColorChoice = new ArrayList<>();
- }
- return this.egColorChoice;
- }
-
- public boolean isSetEGColorChoice() {
- return ((this.egColorChoice!= null)&&(!this.egColorChoice.isEmpty()));
- }
-
- public void unsetEGColorChoice() {
- this.egColorChoice = null;
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTComplementTransform.java b/src/java/org/apache/poi/sl/draw/binding/CTComplementTransform.java
deleted file mode 100644
index b10ce15091..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTComplementTransform.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_ComplementTransform complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_ComplementTransform"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_ComplementTransform")
-public class CTComplementTransform {
-
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTConnection.java b/src/java/org/apache/poi/sl/draw/binding/CTConnection.java
deleted file mode 100644
index 76999eda02..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTConnection.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Connection complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_Connection"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;attribute name="id" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_DrawingElementId" /&gt;
- * &lt;attribute name="idx" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedInt" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Connection")
-public class CTConnection {
-
- @XmlAttribute(name = "id", required = true)
- protected long id;
- @XmlAttribute(name = "idx", required = true)
- @XmlSchemaType(name = "unsignedInt")
- protected long idx;
-
- /**
- * Gets the value of the id property.
- *
- */
- public long getId() {
- return id;
- }
-
- /**
- * Sets the value of the id property.
- *
- */
- public void setId(long value) {
- this.id = value;
- }
-
- public boolean isSetId() {
- return true;
- }
-
- /**
- * Gets the value of the idx property.
- *
- */
- public long getIdx() {
- return idx;
- }
-
- /**
- * Sets the value of the idx property.
- *
- */
- public void setIdx(long value) {
- this.idx = value;
- }
-
- public boolean isSetIdx() {
- return true;
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTConnectionSiteList.java b/src/java/org/apache/poi/sl/draw/binding/CTConnectionSiteList.java
deleted file mode 100644
index 6669ac2e6d..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTConnectionSiteList.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_ConnectionSiteList complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_ConnectionSiteList"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="cxn" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_ConnectionSite" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_ConnectionSiteList", propOrder = {
- "cxn"
-})
-public class CTConnectionSiteList {
-
- protected List<CTConnectionSite> cxn;
-
- /**
- * Gets the value of the cxn property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the cxn property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getCxn().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link CTConnectionSite }
- *
- *
- */
- public List<CTConnectionSite> getCxn() {
- if (cxn == null) {
- cxn = new ArrayList<>();
- }
- return this.cxn;
- }
-
- public boolean isSetCxn() {
- return ((this.cxn!= null)&&(!this.cxn.isEmpty()));
- }
-
- public void unsetCxn() {
- this.cxn = null;
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTCustomGeometry2D.java b/src/java/org/apache/poi/sl/draw/binding/CTCustomGeometry2D.java
deleted file mode 100644
index d23b9a024c..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTCustomGeometry2D.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_CustomGeometry2D complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_CustomGeometry2D"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="avLst" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_GeomGuideList" minOccurs="0"/&gt;
- * &lt;element name="gdLst" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_GeomGuideList" minOccurs="0"/&gt;
- * &lt;element name="ahLst" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_AdjustHandleList" minOccurs="0"/&gt;
- * &lt;element name="cxnLst" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_ConnectionSiteList" minOccurs="0"/&gt;
- * &lt;element name="rect" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_GeomRect" minOccurs="0"/&gt;
- * &lt;element name="pathLst" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DList"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_CustomGeometry2D", propOrder = {
- "avLst",
- "gdLst",
- "ahLst",
- "cxnLst",
- "rect",
- "pathLst"
-})
-public class CTCustomGeometry2D {
-
- protected CTGeomGuideList avLst;
- protected CTGeomGuideList gdLst;
- protected CTAdjustHandleList ahLst;
- protected CTConnectionSiteList cxnLst;
- protected CTGeomRect rect;
- @XmlElement(required = true)
- protected CTPath2DList pathLst;
-
- /**
- * Gets the value of the avLst property.
- *
- * @return
- * possible object is
- * {@link CTGeomGuideList }
- *
- */
- public CTGeomGuideList getAvLst() {
- return avLst;
- }
-
- /**
- * Sets the value of the avLst property.
- *
- * @param value
- * allowed object is
- * {@link CTGeomGuideList }
- *
- */
- public void setAvLst(CTGeomGuideList value) {
- this.avLst = value;
- }
-
- public boolean isSetAvLst() {
- return (this.avLst!= null);
- }
-
- /**
- * Gets the value of the gdLst property.
- *
- * @return
- * possible object is
- * {@link CTGeomGuideList }
- *
- */
- public CTGeomGuideList getGdLst() {
- return gdLst;
- }
-
- /**
- * Sets the value of the gdLst property.
- *
- * @param value
- * allowed object is
- * {@link CTGeomGuideList }
- *
- */
- public void setGdLst(CTGeomGuideList value) {
- this.gdLst = value;
- }
-
- public boolean isSetGdLst() {
- return (this.gdLst!= null);
- }
-
- /**
- * Gets the value of the ahLst property.
- *
- * @return
- * possible object is
- * {@link CTAdjustHandleList }
- *
- */
- public CTAdjustHandleList getAhLst() {
- return ahLst;
- }
-
- /**
- * Sets the value of the ahLst property.
- *
- * @param value
- * allowed object is
- * {@link CTAdjustHandleList }
- *
- */
- public void setAhLst(CTAdjustHandleList value) {
- this.ahLst = value;
- }
-
- public boolean isSetAhLst() {
- return (this.ahLst!= null);
- }
-
- /**
- * Gets the value of the cxnLst property.
- *
- * @return
- * possible object is
- * {@link CTConnectionSiteList }
- *
- */
- public CTConnectionSiteList getCxnLst() {
- return cxnLst;
- }
-
- /**
- * Sets the value of the cxnLst property.
- *
- * @param value
- * allowed object is
- * {@link CTConnectionSiteList }
- *
- */
- public void setCxnLst(CTConnectionSiteList value) {
- this.cxnLst = value;
- }
-
- public boolean isSetCxnLst() {
- return (this.cxnLst!= null);
- }
-
- /**
- * Gets the value of the rect property.
- *
- * @return
- * possible object is
- * {@link CTGeomRect }
- *
- */
- public CTGeomRect getRect() {
- return rect;
- }
-
- /**
- * Sets the value of the rect property.
- *
- * @param value
- * allowed object is
- * {@link CTGeomRect }
- *
- */
- public void setRect(CTGeomRect value) {
- this.rect = value;
- }
-
- public boolean isSetRect() {
- return (this.rect!= null);
- }
-
- /**
- * Gets the value of the pathLst property.
- *
- * @return
- * possible object is
- * {@link CTPath2DList }
- *
- */
- public CTPath2DList getPathLst() {
- return pathLst;
- }
-
- /**
- * Sets the value of the pathLst property.
- *
- * @param value
- * allowed object is
- * {@link CTPath2DList }
- *
- */
- public void setPathLst(CTPath2DList value) {
- this.pathLst = value;
- }
-
- public boolean isSetPathLst() {
- return (this.pathLst!= null);
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTEmbeddedWAVAudioFile.java b/src/java/org/apache/poi/sl/draw/binding/CTEmbeddedWAVAudioFile.java
deleted file mode 100644
index 21f0e04a09..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTEmbeddedWAVAudioFile.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_EmbeddedWAVAudioFile complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_EmbeddedWAVAudioFile"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;attribute ref="{http://schemas.openxmlformats.org/officeDocument/2006/relationships}embed use="required""/&gt;
- * &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" default="" /&gt;
- * &lt;attribute name="builtIn" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_EmbeddedWAVAudioFile")
-public class CTEmbeddedWAVAudioFile {
-
- @XmlAttribute(name = "embed", namespace = "http://schemas.openxmlformats.org/officeDocument/2006/relationships", required = true)
- protected String embed;
- @XmlAttribute(name = "name")
- protected String name;
- @XmlAttribute(name = "builtIn")
- protected Boolean builtIn;
-
- /**
- * Embedded Audio File Relationship ID
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getEmbed() {
- return embed;
- }
-
- /**
- * Sets the value of the embed property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setEmbed(String value) {
- this.embed = value;
- }
-
- public boolean isSetEmbed() {
- return (this.embed!= null);
- }
-
- /**
- * Gets the value of the name property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getName() {
- if (name == null) {
- return "";
- } else {
- return name;
- }
- }
-
- /**
- * Sets the value of the name property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setName(String value) {
- this.name = value;
- }
-
- public boolean isSetName() {
- return (this.name!= null);
- }
-
- /**
- * Gets the value of the builtIn property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public boolean isBuiltIn() {
- if (builtIn == null) {
- return false;
- } else {
- return builtIn;
- }
- }
-
- /**
- * Sets the value of the builtIn property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- public void setBuiltIn(boolean value) {
- this.builtIn = value;
- }
-
- public boolean isSetBuiltIn() {
- return (this.builtIn!= null);
- }
-
- public void unsetBuiltIn() {
- this.builtIn = null;
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTFixedPercentage.java b/src/java/org/apache/poi/sl/draw/binding/CTFixedPercentage.java
deleted file mode 100644
index 0260aa6946..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTFixedPercentage.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_FixedPercentage complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_FixedPercentage"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;attribute name="val" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_FixedPercentage" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_FixedPercentage")
-public class CTFixedPercentage {
-
- @XmlAttribute(name = "val", required = true)
- protected int val;
-
- /**
- * Gets the value of the val property.
- *
- */
- public int getVal() {
- return val;
- }
-
- /**
- * Sets the value of the val property.
- *
- */
- public void setVal(int value) {
- this.val = value;
- }
-
- public boolean isSetVal() {
- return true;
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTGammaTransform.java b/src/java/org/apache/poi/sl/draw/binding/CTGammaTransform.java
deleted file mode 100644
index d9b827b739..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTGammaTransform.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_GammaTransform complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_GammaTransform"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_GammaTransform")
-public class CTGammaTransform {
-
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTGeomGuide.java b/src/java/org/apache/poi/sl/draw/binding/CTGeomGuide.java
deleted file mode 100644
index bb984f57ed..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTGeomGuide.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for CT_GeomGuide complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_GeomGuide"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;attribute name="name" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_GeomGuideName" /&gt;
- * &lt;attribute name="fmla" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_GeomGuideFormula" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_GeomGuide")
-public class CTGeomGuide {
-
- @XmlAttribute(name = "name", required = true)
- @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
- protected String name;
- @XmlAttribute(name = "fmla", required = true)
- protected String fmla;
-
- /**
- * Gets the value of the name property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getName() {
- return name;
- }
-
- /**
- * Sets the value of the name property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setName(String value) {
- this.name = value;
- }
-
- public boolean isSetName() {
- return (this.name!= null);
- }
-
- /**
- * Gets the value of the fmla property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getFmla() {
- return fmla;
- }
-
- /**
- * Sets the value of the fmla property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setFmla(String value) {
- this.fmla = value;
- }
-
- public boolean isSetFmla() {
- return (this.fmla!= null);
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTGeomGuideList.java b/src/java/org/apache/poi/sl/draw/binding/CTGeomGuideList.java
deleted file mode 100644
index 1ecd828009..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTGeomGuideList.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_GeomGuideList complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_GeomGuideList"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="gd" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_GeomGuide" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_GeomGuideList", propOrder = {
- "gd"
-})
-public class CTGeomGuideList {
-
- protected List<CTGeomGuide> gd;
-
- /**
- * Gets the value of the gd property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the gd property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getGd().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link CTGeomGuide }
- *
- *
- */
- public List<CTGeomGuide> getGd() {
- if (gd == null) {
- gd = new ArrayList<>();
- }
- return this.gd;
- }
-
- public boolean isSetGd() {
- return ((this.gd!= null)&&(!this.gd.isEmpty()));
- }
-
- public void unsetGd() {
- this.gd = null;
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTGeomRect.java b/src/java/org/apache/poi/sl/draw/binding/CTGeomRect.java
deleted file mode 100644
index 931ba60802..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTGeomRect.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_GeomRect complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_GeomRect"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;attribute name="l" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate" /&gt;
- * &lt;attribute name="t" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate" /&gt;
- * &lt;attribute name="r" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate" /&gt;
- * &lt;attribute name="b" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_GeomRect")
-public class CTGeomRect {
-
- @XmlAttribute(name = "l", required = true)
- protected String l;
- @XmlAttribute(name = "t", required = true)
- protected String t;
- @XmlAttribute(name = "r", required = true)
- protected String r;
- @XmlAttribute(name = "b", required = true)
- protected String b;
-
- /**
- * Gets the value of the l property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getL() {
- return l;
- }
-
- /**
- * Sets the value of the l property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setL(String value) {
- this.l = value;
- }
-
- public boolean isSetL() {
- return (this.l!= null);
- }
-
- /**
- * Gets the value of the t property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getT() {
- return t;
- }
-
- /**
- * Sets the value of the t property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setT(String value) {
- this.t = value;
- }
-
- public boolean isSetT() {
- return (this.t!= null);
- }
-
- /**
- * Gets the value of the r property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getR() {
- return r;
- }
-
- /**
- * Sets the value of the r property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setR(String value) {
- this.r = value;
- }
-
- public boolean isSetR() {
- return (this.r!= null);
- }
-
- /**
- * Gets the value of the b property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getB() {
- return b;
- }
-
- /**
- * Sets the value of the b property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setB(String value) {
- this.b = value;
- }
-
- public boolean isSetB() {
- return (this.b!= null);
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTGrayscaleTransform.java b/src/java/org/apache/poi/sl/draw/binding/CTGrayscaleTransform.java
deleted file mode 100644
index 8bbbab8b83..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTGrayscaleTransform.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_GrayscaleTransform complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_GrayscaleTransform"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_GrayscaleTransform")
-public class CTGrayscaleTransform {
-
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTGroupTransform2D.java b/src/java/org/apache/poi/sl/draw/binding/CTGroupTransform2D.java
deleted file mode 100644
index 267c2fa1f2..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTGroupTransform2D.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_GroupTransform2D complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_GroupTransform2D"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="off" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Point2D" minOccurs="0"/&gt;
- * &lt;element name="ext" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_PositiveSize2D" minOccurs="0"/&gt;
- * &lt;element name="chOff" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Point2D" minOccurs="0"/&gt;
- * &lt;element name="chExt" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_PositiveSize2D" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;attribute name="rot" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Angle" default="0" /&gt;
- * &lt;attribute name="flipH" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&gt;
- * &lt;attribute name="flipV" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_GroupTransform2D", propOrder = {
- "off",
- "ext",
- "chOff",
- "chExt"
-})
-public class CTGroupTransform2D {
-
- protected CTPoint2D off;
- protected CTPositiveSize2D ext;
- protected CTPoint2D chOff;
- protected CTPositiveSize2D chExt;
- @XmlAttribute(name = "rot")
- protected Integer rot;
- @XmlAttribute(name = "flipH")
- protected Boolean flipH;
- @XmlAttribute(name = "flipV")
- protected Boolean flipV;
-
- /**
- * Gets the value of the off property.
- *
- * @return
- * possible object is
- * {@link CTPoint2D }
- *
- */
- public CTPoint2D getOff() {
- return off;
- }
-
- /**
- * Sets the value of the off property.
- *
- * @param value
- * allowed object is
- * {@link CTPoint2D }
- *
- */
- public void setOff(CTPoint2D value) {
- this.off = value;
- }
-
- public boolean isSetOff() {
- return (this.off!= null);
- }
-
- /**
- * Gets the value of the ext property.
- *
- * @return
- * possible object is
- * {@link CTPositiveSize2D }
- *
- */
- public CTPositiveSize2D getExt() {
- return ext;
- }
-
- /**
- * Sets the value of the ext property.
- *
- * @param value
- * allowed object is
- * {@link CTPositiveSize2D }
- *
- */
- public void setExt(CTPositiveSize2D value) {
- this.ext = value;
- }
-
- public boolean isSetExt() {
- return (this.ext!= null);
- }
-
- /**
- * Gets the value of the chOff property.
- *
- * @return
- * possible object is
- * {@link CTPoint2D }
- *
- */
- public CTPoint2D getChOff() {
- return chOff;
- }
-
- /**
- * Sets the value of the chOff property.
- *
- * @param value
- * allowed object is
- * {@link CTPoint2D }
- *
- */
- public void setChOff(CTPoint2D value) {
- this.chOff = value;
- }
-
- public boolean isSetChOff() {
- return (this.chOff!= null);
- }
-
- /**
- * Gets the value of the chExt property.
- *
- * @return
- * possible object is
- * {@link CTPositiveSize2D }
- *
- */
- public CTPositiveSize2D getChExt() {
- return chExt;
- }
-
- /**
- * Sets the value of the chExt property.
- *
- * @param value
- * allowed object is
- * {@link CTPositiveSize2D }
- *
- */
- public void setChExt(CTPositiveSize2D value) {
- this.chExt = value;
- }
-
- public boolean isSetChExt() {
- return (this.chExt!= null);
- }
-
- /**
- * Gets the value of the rot property.
- *
- * @return
- * possible object is
- * {@link Integer }
- *
- */
- public int getRot() {
- if (rot == null) {
- return 0;
- } else {
- return rot;
- }
- }
-
- /**
- * Sets the value of the rot property.
- *
- * @param value
- * allowed object is
- * {@link Integer }
- *
- */
- public void setRot(int value) {
- this.rot = value;
- }
-
- public boolean isSetRot() {
- return (this.rot!= null);
- }
-
- public void unsetRot() {
- this.rot = null;
- }
-
- /**
- * Gets the value of the flipH property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public boolean isFlipH() {
- if (flipH == null) {
- return false;
- } else {
- return flipH;
- }
- }
-
- /**
- * Sets the value of the flipH property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- public void setFlipH(boolean value) {
- this.flipH = value;
- }
-
- public boolean isSetFlipH() {
- return (this.flipH!= null);
- }
-
- public void unsetFlipH() {
- this.flipH = null;
- }
-
- /**
- * Gets the value of the flipV property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public boolean isFlipV() {
- if (flipV == null) {
- return false;
- } else {
- return flipV;
- }
- }
-
- /**
- * Sets the value of the flipV property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- public void setFlipV(boolean value) {
- this.flipV = value;
- }
-
- public boolean isSetFlipV() {
- return (this.flipV!= null);
- }
-
- public void unsetFlipV() {
- this.flipV = null;
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTHslColor.java b/src/java/org/apache/poi/sl/draw/binding/CTHslColor.java
deleted file mode 100644
index 6aa3d58e79..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTHslColor.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_HslColor complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_HslColor"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;group ref="{http://schemas.openxmlformats.org/drawingml/2006/main}EG_ColorTransform" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;attribute name="hue" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveFixedAngle" /&gt;
- * &lt;attribute name="sat" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage" /&gt;
- * &lt;attribute name="lum" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_HslColor", propOrder = {
- "egColorTransform"
-})
-public class CTHslColor {
-
- @XmlElementRefs({
- @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false)
- })
- protected List<JAXBElement<?>> egColorTransform;
- @XmlAttribute(name = "hue", required = true)
- protected int hue;
- @XmlAttribute(name = "sat", required = true)
- protected int sat;
- @XmlAttribute(name = "lum", required = true)
- protected int lum;
-
- /**
- * Gets the value of the egColorTransform property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the egColorTransform property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getEGColorTransform().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- *
- *
- */
- public List<JAXBElement<?>> getEGColorTransform() {
- if (egColorTransform == null) {
- egColorTransform = new ArrayList<>();
- }
- return this.egColorTransform;
- }
-
- public boolean isSetEGColorTransform() {
- return ((this.egColorTransform!= null)&&(!this.egColorTransform.isEmpty()));
- }
-
- public void unsetEGColorTransform() {
- this.egColorTransform = null;
- }
-
- /**
- * Gets the value of the hue property.
- *
- */
- public int getHue() {
- return hue;
- }
-
- /**
- * Sets the value of the hue property.
- *
- */
- public void setHue(int value) {
- this.hue = value;
- }
-
- public boolean isSetHue() {
- return true;
- }
-
- /**
- * Gets the value of the sat property.
- *
- */
- public int getSat() {
- return sat;
- }
-
- /**
- * Sets the value of the sat property.
- *
- */
- public void setSat(int value) {
- this.sat = value;
- }
-
- public boolean isSetSat() {
- return true;
- }
-
- /**
- * Gets the value of the lum property.
- *
- */
- public int getLum() {
- return lum;
- }
-
- /**
- * Sets the value of the lum property.
- *
- */
- public void setLum(int value) {
- this.lum = value;
- }
-
- public boolean isSetLum() {
- return true;
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTHyperlink.java b/src/java/org/apache/poi/sl/draw/binding/CTHyperlink.java
deleted file mode 100644
index 0157bf0b71..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTHyperlink.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Hyperlink complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_Hyperlink"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="snd" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_EmbeddedWAVAudioFile" minOccurs="0"/&gt;
- * &lt;element name="extLst" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_OfficeArtExtensionList" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;attribute ref="{http://schemas.openxmlformats.org/officeDocument/2006/relationships}id"/&gt;
- * &lt;attribute name="invalidUrl" type="{http://www.w3.org/2001/XMLSchema}string" default="" /&gt;
- * &lt;attribute name="action" type="{http://www.w3.org/2001/XMLSchema}string" default="" /&gt;
- * &lt;attribute name="tgtFrame" type="{http://www.w3.org/2001/XMLSchema}string" default="" /&gt;
- * &lt;attribute name="tooltip" type="{http://www.w3.org/2001/XMLSchema}string" default="" /&gt;
- * &lt;attribute name="history" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&gt;
- * &lt;attribute name="highlightClick" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&gt;
- * &lt;attribute name="endSnd" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Hyperlink", propOrder = {
- "snd",
- "extLst"
-})
-public class CTHyperlink {
-
- protected CTEmbeddedWAVAudioFile snd;
- protected CTOfficeArtExtensionList extLst;
- @XmlAttribute(name = "id", namespace = "http://schemas.openxmlformats.org/officeDocument/2006/relationships")
- protected String id;
- @XmlAttribute(name = "invalidUrl")
- protected String invalidUrl;
- @XmlAttribute(name = "action")
- protected String action;
- @XmlAttribute(name = "tgtFrame")
- protected String tgtFrame;
- @XmlAttribute(name = "tooltip")
- protected String tooltip;
- @XmlAttribute(name = "history")
- protected Boolean history;
- @XmlAttribute(name = "highlightClick")
- protected Boolean highlightClick;
- @XmlAttribute(name = "endSnd")
- protected Boolean endSnd;
-
- /**
- * Gets the value of the snd property.
- *
- * @return
- * possible object is
- * {@link CTEmbeddedWAVAudioFile }
- *
- */
- public CTEmbeddedWAVAudioFile getSnd() {
- return snd;
- }
-
- /**
- * Sets the value of the snd property.
- *
- * @param value
- * allowed object is
- * {@link CTEmbeddedWAVAudioFile }
- *
- */
- public void setSnd(CTEmbeddedWAVAudioFile value) {
- this.snd = value;
- }
-
- public boolean isSetSnd() {
- return (this.snd!= null);
- }
-
- /**
- * Gets the value of the extLst property.
- *
- * @return
- * possible object is
- * {@link CTOfficeArtExtensionList }
- *
- */
- public CTOfficeArtExtensionList getExtLst() {
- return extLst;
- }
-
- /**
- * Sets the value of the extLst property.
- *
- * @param value
- * allowed object is
- * {@link CTOfficeArtExtensionList }
- *
- */
- public void setExtLst(CTOfficeArtExtensionList value) {
- this.extLst = value;
- }
-
- public boolean isSetExtLst() {
- return (this.extLst!= null);
- }
-
- /**
- * Drawing Object Hyperlink Target
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getId() {
- return id;
- }
-
- /**
- * Sets the value of the id property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setId(String value) {
- this.id = value;
- }
-
- public boolean isSetId() {
- return (this.id!= null);
- }
-
- /**
- * Gets the value of the invalidUrl property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getInvalidUrl() {
- if (invalidUrl == null) {
- return "";
- } else {
- return invalidUrl;
- }
- }
-
- /**
- * Sets the value of the invalidUrl property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setInvalidUrl(String value) {
- this.invalidUrl = value;
- }
-
- public boolean isSetInvalidUrl() {
- return (this.invalidUrl!= null);
- }
-
- /**
- * Gets the value of the action property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getAction() {
- if (action == null) {
- return "";
- } else {
- return action;
- }
- }
-
- /**
- * Sets the value of the action property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setAction(String value) {
- this.action = value;
- }
-
- public boolean isSetAction() {
- return (this.action!= null);
- }
-
- /**
- * Gets the value of the tgtFrame property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getTgtFrame() {
- if (tgtFrame == null) {
- return "";
- } else {
- return tgtFrame;
- }
- }
-
- /**
- * Sets the value of the tgtFrame property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setTgtFrame(String value) {
- this.tgtFrame = value;
- }
-
- public boolean isSetTgtFrame() {
- return (this.tgtFrame!= null);
- }
-
- /**
- * Gets the value of the tooltip property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getTooltip() {
- if (tooltip == null) {
- return "";
- } else {
- return tooltip;
- }
- }
-
- /**
- * Sets the value of the tooltip property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setTooltip(String value) {
- this.tooltip = value;
- }
-
- public boolean isSetTooltip() {
- return (this.tooltip!= null);
- }
-
- /**
- * Gets the value of the history property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public boolean isHistory() {
- if (history == null) {
- return true;
- } else {
- return history;
- }
- }
-
- /**
- * Sets the value of the history property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- public void setHistory(boolean value) {
- this.history = value;
- }
-
- public boolean isSetHistory() {
- return (this.history!= null);
- }
-
- public void unsetHistory() {
- this.history = null;
- }
-
- /**
- * Gets the value of the highlightClick property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public boolean isHighlightClick() {
- if (highlightClick == null) {
- return false;
- } else {
- return highlightClick;
- }
- }
-
- /**
- * Sets the value of the highlightClick property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- public void setHighlightClick(boolean value) {
- this.highlightClick = value;
- }
-
- public boolean isSetHighlightClick() {
- return (this.highlightClick!= null);
- }
-
- public void unsetHighlightClick() {
- this.highlightClick = null;
- }
-
- /**
- * Gets the value of the endSnd property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public boolean isEndSnd() {
- if (endSnd == null) {
- return false;
- } else {
- return endSnd;
- }
- }
-
- /**
- * Sets the value of the endSnd property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- public void setEndSnd(boolean value) {
- this.endSnd = value;
- }
-
- public boolean isSetEndSnd() {
- return (this.endSnd!= null);
- }
-
- public void unsetEndSnd() {
- this.endSnd = null;
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTInverseGammaTransform.java b/src/java/org/apache/poi/sl/draw/binding/CTInverseGammaTransform.java
deleted file mode 100644
index 6438ade059..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTInverseGammaTransform.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_InverseGammaTransform complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_InverseGammaTransform"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_InverseGammaTransform")
-public class CTInverseGammaTransform {
-
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTInverseTransform.java b/src/java/org/apache/poi/sl/draw/binding/CTInverseTransform.java
deleted file mode 100644
index a2de9b8057..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTInverseTransform.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_InverseTransform complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_InverseTransform"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_InverseTransform")
-public class CTInverseTransform {
-
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTOfficeArtExtension.java b/src/java/org/apache/poi/sl/draw/binding/CTOfficeArtExtension.java
deleted file mode 100644
index b838115207..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTOfficeArtExtension.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for CT_OfficeArtExtension complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_OfficeArtExtension"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;any processContents='lax'/&gt;
- * &lt;/sequence&gt;
- * &lt;attribute name="uri" type="{http://www.w3.org/2001/XMLSchema}token" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_OfficeArtExtension", propOrder = {
- "any"
-})
-public class CTOfficeArtExtension {
-
- @XmlAnyElement(lax = true)
- protected Object any;
- @XmlAttribute(name = "uri")
- @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
- @XmlSchemaType(name = "token")
- protected String uri;
-
- /**
- * Gets the value of the any property.
- *
- * @return
- * possible object is
- * {@link Object }
- * {@link Element }
- *
- */
- public Object getAny() {
- return any;
- }
-
- /**
- * Sets the value of the any property.
- *
- * @param value
- * allowed object is
- * {@link Object }
- * {@link Element }
- *
- */
- public void setAny(Object value) {
- this.any = value;
- }
-
- public boolean isSetAny() {
- return (this.any!= null);
- }
-
- /**
- * Gets the value of the uri property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getUri() {
- return uri;
- }
-
- /**
- * Sets the value of the uri property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setUri(String value) {
- this.uri = value;
- }
-
- public boolean isSetUri() {
- return (this.uri!= null);
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTOfficeArtExtensionList.java b/src/java/org/apache/poi/sl/draw/binding/CTOfficeArtExtensionList.java
deleted file mode 100644
index f94af48e6d..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTOfficeArtExtensionList.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_OfficeArtExtensionList complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_OfficeArtExtensionList"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;group ref="{http://schemas.openxmlformats.org/drawingml/2006/main}EG_OfficeArtExtensionList"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_OfficeArtExtensionList", propOrder = {
- "ext"
-})
-public class CTOfficeArtExtensionList {
-
- protected List<CTOfficeArtExtension> ext;
-
- /**
- * Gets the value of the ext property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the ext property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getExt().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link CTOfficeArtExtension }
- *
- *
- */
- public List<CTOfficeArtExtension> getExt() {
- if (ext == null) {
- ext = new ArrayList<>();
- }
- return this.ext;
- }
-
- public boolean isSetExt() {
- return ((this.ext!= null)&&(!this.ext.isEmpty()));
- }
-
- public void unsetExt() {
- this.ext = null;
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPath2D.java b/src/java/org/apache/poi/sl/draw/binding/CTPath2D.java
deleted file mode 100644
index a7bea25728..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTPath2D.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Path2D complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_Path2D"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;choice maxOccurs="unbounded" minOccurs="0"&gt;
- * &lt;element name="close" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DClose"/&gt;
- * &lt;element name="moveTo" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DMoveTo"/&gt;
- * &lt;element name="lnTo" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DLineTo"/&gt;
- * &lt;element name="arcTo" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DArcTo"/&gt;
- * &lt;element name="quadBezTo" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DQuadBezierTo"/&gt;
- * &lt;element name="cubicBezTo" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DCubicBezierTo"/&gt;
- * &lt;/choice&gt;
- * &lt;attribute name="w" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveCoordinate" default="0" /&gt;
- * &lt;attribute name="h" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveCoordinate" default="0" /&gt;
- * &lt;attribute name="fill" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PathFillMode" default="norm" /&gt;
- * &lt;attribute name="stroke" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&gt;
- * &lt;attribute name="extrusionOk" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Path2D", propOrder = {
- "closeOrMoveToOrLnTo"
-})
-public class CTPath2D {
-
- @XmlElements({
- @XmlElement(name = "close", type = CTPath2DClose.class),
- @XmlElement(name = "moveTo", type = CTPath2DMoveTo.class),
- @XmlElement(name = "lnTo", type = CTPath2DLineTo.class),
- @XmlElement(name = "arcTo", type = CTPath2DArcTo.class),
- @XmlElement(name = "quadBezTo", type = CTPath2DQuadBezierTo.class),
- @XmlElement(name = "cubicBezTo", type = CTPath2DCubicBezierTo.class)
- })
- protected List<Object> closeOrMoveToOrLnTo;
- @XmlAttribute(name = "w")
- protected Long w;
- @XmlAttribute(name = "h")
- protected Long h;
- @XmlAttribute(name = "fill")
- protected STPathFillMode fill;
- @XmlAttribute(name = "stroke")
- protected Boolean stroke;
- @XmlAttribute(name = "extrusionOk")
- protected Boolean extrusionOk;
-
- /**
- * Gets the value of the closeOrMoveToOrLnTo property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the closeOrMoveToOrLnTo property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getCloseOrMoveToOrLnTo().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link CTPath2DClose }
- * {@link CTPath2DMoveTo }
- * {@link CTPath2DLineTo }
- * {@link CTPath2DArcTo }
- * {@link CTPath2DQuadBezierTo }
- * {@link CTPath2DCubicBezierTo }
- *
- *
- */
- public List<Object> getCloseOrMoveToOrLnTo() {
- if (closeOrMoveToOrLnTo == null) {
- closeOrMoveToOrLnTo = new ArrayList<>();
- }
- return this.closeOrMoveToOrLnTo;
- }
-
- public boolean isSetCloseOrMoveToOrLnTo() {
- return ((this.closeOrMoveToOrLnTo!= null)&&(!this.closeOrMoveToOrLnTo.isEmpty()));
- }
-
- public void unsetCloseOrMoveToOrLnTo() {
- this.closeOrMoveToOrLnTo = null;
- }
-
- /**
- * Gets the value of the w property.
- *
- * @return
- * possible object is
- * {@link Long }
- *
- */
- public long getW() {
- if (w == null) {
- return 0L;
- } else {
- return w;
- }
- }
-
- /**
- * Sets the value of the w property.
- *
- * @param value
- * allowed object is
- * {@link Long }
- *
- */
- public void setW(long value) {
- this.w = value;
- }
-
- public boolean isSetW() {
- return (this.w!= null);
- }
-
- public void unsetW() {
- this.w = null;
- }
-
- /**
- * Gets the value of the h property.
- *
- * @return
- * possible object is
- * {@link Long }
- *
- */
- public long getH() {
- if (h == null) {
- return 0L;
- } else {
- return h;
- }
- }
-
- /**
- * Sets the value of the h property.
- *
- * @param value
- * allowed object is
- * {@link Long }
- *
- */
- public void setH(long value) {
- this.h = value;
- }
-
- public boolean isSetH() {
- return (this.h!= null);
- }
-
- public void unsetH() {
- this.h = null;
- }
-
- /**
- * Gets the value of the fill property.
- *
- * @return
- * possible object is
- * {@link STPathFillMode }
- *
- */
- public STPathFillMode getFill() {
- if (fill == null) {
- return STPathFillMode.NORM;
- } else {
- return fill;
- }
- }
-
- /**
- * Sets the value of the fill property.
- *
- * @param value
- * allowed object is
- * {@link STPathFillMode }
- *
- */
- public void setFill(STPathFillMode value) {
- this.fill = value;
- }
-
- public boolean isSetFill() {
- return (this.fill!= null);
- }
-
- /**
- * Gets the value of the stroke property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public boolean isStroke() {
- if (stroke == null) {
- return true;
- } else {
- return stroke;
- }
- }
-
- /**
- * Sets the value of the stroke property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- public void setStroke(boolean value) {
- this.stroke = value;
- }
-
- public boolean isSetStroke() {
- return (this.stroke!= null);
- }
-
- public void unsetStroke() {
- this.stroke = null;
- }
-
- /**
- * Gets the value of the extrusionOk property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public boolean isExtrusionOk() {
- if (extrusionOk == null) {
- return true;
- } else {
- return extrusionOk;
- }
- }
-
- /**
- * Sets the value of the extrusionOk property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- public void setExtrusionOk(boolean value) {
- this.extrusionOk = value;
- }
-
- public boolean isSetExtrusionOk() {
- return (this.extrusionOk!= null);
- }
-
- public void unsetExtrusionOk() {
- this.extrusionOk = null;
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPath2DArcTo.java b/src/java/org/apache/poi/sl/draw/binding/CTPath2DArcTo.java
deleted file mode 100644
index 690e674948..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTPath2DArcTo.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Path2DArcTo complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_Path2DArcTo"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;attribute name="wR" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate" /&gt;
- * &lt;attribute name="hR" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate" /&gt;
- * &lt;attribute name="stAng" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjAngle" /&gt;
- * &lt;attribute name="swAng" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjAngle" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Path2DArcTo")
-public class CTPath2DArcTo {
-
- @XmlAttribute(name = "wR", required = true)
- protected String wr;
- @XmlAttribute(name = "hR", required = true)
- protected String hr;
- @XmlAttribute(name = "stAng", required = true)
- protected String stAng;
- @XmlAttribute(name = "swAng", required = true)
- protected String swAng;
-
- /**
- * Gets the value of the wr property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getWR() {
- return wr;
- }
-
- /**
- * Sets the value of the wr property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setWR(String value) {
- this.wr = value;
- }
-
- public boolean isSetWR() {
- return (this.wr!= null);
- }
-
- /**
- * Gets the value of the hr property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getHR() {
- return hr;
- }
-
- /**
- * Sets the value of the hr property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setHR(String value) {
- this.hr = value;
- }
-
- public boolean isSetHR() {
- return (this.hr!= null);
- }
-
- /**
- * Gets the value of the stAng property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getStAng() {
- return stAng;
- }
-
- /**
- * Sets the value of the stAng property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setStAng(String value) {
- this.stAng = value;
- }
-
- public boolean isSetStAng() {
- return (this.stAng!= null);
- }
-
- /**
- * Gets the value of the swAng property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSwAng() {
- return swAng;
- }
-
- /**
- * Sets the value of the swAng property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSwAng(String value) {
- this.swAng = value;
- }
-
- public boolean isSetSwAng() {
- return (this.swAng!= null);
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPath2DClose.java b/src/java/org/apache/poi/sl/draw/binding/CTPath2DClose.java
deleted file mode 100644
index a9ea14f508..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTPath2DClose.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Path2DClose complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_Path2DClose"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Path2DClose")
-public class CTPath2DClose {
-
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPath2DCubicBezierTo.java b/src/java/org/apache/poi/sl/draw/binding/CTPath2DCubicBezierTo.java
deleted file mode 100644
index 35ed18a1c4..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTPath2DCubicBezierTo.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Path2DCubicBezierTo complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_Path2DCubicBezierTo"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="pt" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_AdjPoint2D" maxOccurs="3" minOccurs="3"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Path2DCubicBezierTo", propOrder = {
- "pt"
-})
-public class CTPath2DCubicBezierTo {
-
- @XmlElement(required = true)
- protected List<CTAdjPoint2D> pt;
-
- /**
- * Gets the value of the pt property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the pt property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getPt().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link CTAdjPoint2D }
- *
- *
- */
- public List<CTAdjPoint2D> getPt() {
- if (pt == null) {
- pt = new ArrayList<>();
- }
- return this.pt;
- }
-
- public boolean isSetPt() {
- return ((this.pt!= null)&&(!this.pt.isEmpty()));
- }
-
- public void unsetPt() {
- this.pt = null;
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPath2DLineTo.java b/src/java/org/apache/poi/sl/draw/binding/CTPath2DLineTo.java
deleted file mode 100644
index 51b5c54426..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTPath2DLineTo.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Path2DLineTo complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_Path2DLineTo"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="pt" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_AdjPoint2D"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Path2DLineTo", propOrder = {
- "pt"
-})
-public class CTPath2DLineTo {
-
- @XmlElement(required = true)
- protected CTAdjPoint2D pt;
-
- /**
- * Gets the value of the pt property.
- *
- * @return
- * possible object is
- * {@link CTAdjPoint2D }
- *
- */
- public CTAdjPoint2D getPt() {
- return pt;
- }
-
- /**
- * Sets the value of the pt property.
- *
- * @param value
- * allowed object is
- * {@link CTAdjPoint2D }
- *
- */
- public void setPt(CTAdjPoint2D value) {
- this.pt = value;
- }
-
- public boolean isSetPt() {
- return (this.pt!= null);
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPath2DList.java b/src/java/org/apache/poi/sl/draw/binding/CTPath2DList.java
deleted file mode 100644
index a63d4a5e41..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTPath2DList.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Path2DList complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_Path2DList"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="path" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2D" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Path2DList", propOrder = {
- "path"
-})
-public class CTPath2DList {
-
- protected List<CTPath2D> path;
-
- /**
- * Gets the value of the path property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the path property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getPath().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link CTPath2D }
- *
- *
- */
- public List<CTPath2D> getPath() {
- if (path == null) {
- path = new ArrayList<>();
- }
- return this.path;
- }
-
- public boolean isSetPath() {
- return ((this.path!= null)&&(!this.path.isEmpty()));
- }
-
- public void unsetPath() {
- this.path = null;
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPath2DMoveTo.java b/src/java/org/apache/poi/sl/draw/binding/CTPath2DMoveTo.java
deleted file mode 100644
index 9efb623d69..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTPath2DMoveTo.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Path2DMoveTo complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_Path2DMoveTo"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="pt" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_AdjPoint2D"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Path2DMoveTo", propOrder = {
- "pt"
-})
-public class CTPath2DMoveTo {
-
- @XmlElement(required = true)
- protected CTAdjPoint2D pt;
-
- /**
- * Gets the value of the pt property.
- *
- * @return
- * possible object is
- * {@link CTAdjPoint2D }
- *
- */
- public CTAdjPoint2D getPt() {
- return pt;
- }
-
- /**
- * Sets the value of the pt property.
- *
- * @param value
- * allowed object is
- * {@link CTAdjPoint2D }
- *
- */
- public void setPt(CTAdjPoint2D value) {
- this.pt = value;
- }
-
- public boolean isSetPt() {
- return (this.pt!= null);
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPath2DQuadBezierTo.java b/src/java/org/apache/poi/sl/draw/binding/CTPath2DQuadBezierTo.java
deleted file mode 100644
index 812d72df8e..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTPath2DQuadBezierTo.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Path2DQuadBezierTo complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_Path2DQuadBezierTo"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="pt" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_AdjPoint2D" maxOccurs="2" minOccurs="2"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Path2DQuadBezierTo", propOrder = {
- "pt"
-})
-public class CTPath2DQuadBezierTo {
-
- @XmlElement(required = true)
- protected List<CTAdjPoint2D> pt;
-
- /**
- * Gets the value of the pt property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the pt property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getPt().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link CTAdjPoint2D }
- *
- *
- */
- public List<CTAdjPoint2D> getPt() {
- if (pt == null) {
- pt = new ArrayList<>();
- }
- return this.pt;
- }
-
- public boolean isSetPt() {
- return ((this.pt!= null)&&(!this.pt.isEmpty()));
- }
-
- public void unsetPt() {
- this.pt = null;
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPercentage.java b/src/java/org/apache/poi/sl/draw/binding/CTPercentage.java
deleted file mode 100644
index 5cbcc27263..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTPercentage.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Percentage complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_Percentage"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;attribute name="val" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Percentage")
-public class CTPercentage {
-
- @XmlAttribute(name = "val", required = true)
- protected int val;
-
- /**
- * Gets the value of the val property.
- *
- */
- public int getVal() {
- return val;
- }
-
- /**
- * Sets the value of the val property.
- *
- */
- public void setVal(int value) {
- this.val = value;
- }
-
- public boolean isSetVal() {
- return true;
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPoint2D.java b/src/java/org/apache/poi/sl/draw/binding/CTPoint2D.java
deleted file mode 100644
index 0248f0c94f..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTPoint2D.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Point2D complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_Point2D"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;attribute name="x" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate" /&gt;
- * &lt;attribute name="y" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Point2D")
-public class CTPoint2D {
-
- @XmlAttribute(name = "x", required = true)
- protected long x;
- @XmlAttribute(name = "y", required = true)
- protected long y;
-
- /**
- * Gets the value of the x property.
- *
- */
- public long getX() {
- return x;
- }
-
- /**
- * Sets the value of the x property.
- *
- */
- public void setX(long value) {
- this.x = value;
- }
-
- public boolean isSetX() {
- return true;
- }
-
- /**
- * Gets the value of the y property.
- *
- */
- public long getY() {
- return y;
- }
-
- /**
- * Sets the value of the y property.
- *
- */
- public void setY(long value) {
- this.y = value;
- }
-
- public boolean isSetY() {
- return true;
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPoint3D.java b/src/java/org/apache/poi/sl/draw/binding/CTPoint3D.java
deleted file mode 100644
index bfd40b3450..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTPoint3D.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Point3D complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_Point3D"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;attribute name="x" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate" /&gt;
- * &lt;attribute name="y" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate" /&gt;
- * &lt;attribute name="z" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Point3D")
-public class CTPoint3D {
-
- @XmlAttribute(name = "x", required = true)
- protected long x;
- @XmlAttribute(name = "y", required = true)
- protected long y;
- @XmlAttribute(name = "z", required = true)
- protected long z;
-
- /**
- * Gets the value of the x property.
- *
- */
- public long getX() {
- return x;
- }
-
- /**
- * Sets the value of the x property.
- *
- */
- public void setX(long value) {
- this.x = value;
- }
-
- public boolean isSetX() {
- return true;
- }
-
- /**
- * Gets the value of the y property.
- *
- */
- public long getY() {
- return y;
- }
-
- /**
- * Sets the value of the y property.
- *
- */
- public void setY(long value) {
- this.y = value;
- }
-
- public boolean isSetY() {
- return true;
- }
-
- /**
- * Gets the value of the z property.
- *
- */
- public long getZ() {
- return z;
- }
-
- /**
- * Sets the value of the z property.
- *
- */
- public void setZ(long value) {
- this.z = value;
- }
-
- public boolean isSetZ() {
- return true;
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedAngle.java b/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedAngle.java
deleted file mode 100644
index 9abb754ea1..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedAngle.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_PositiveFixedAngle complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_PositiveFixedAngle"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;attribute name="val" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveFixedAngle" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_PositiveFixedAngle")
-public class CTPositiveFixedAngle {
-
- @XmlAttribute(name = "val", required = true)
- protected int val;
-
- /**
- * Gets the value of the val property.
- *
- */
- public int getVal() {
- return val;
- }
-
- /**
- * Sets the value of the val property.
- *
- */
- public void setVal(int value) {
- this.val = value;
- }
-
- public boolean isSetVal() {
- return true;
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedPercentage.java b/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedPercentage.java
deleted file mode 100644
index debd297859..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedPercentage.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_PositiveFixedPercentage complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_PositiveFixedPercentage"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;attribute name="val" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveFixedPercentage" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_PositiveFixedPercentage")
-public class CTPositiveFixedPercentage {
-
- @XmlAttribute(name = "val", required = true)
- protected int val;
-
- /**
- * Gets the value of the val property.
- *
- */
- public int getVal() {
- return val;
- }
-
- /**
- * Sets the value of the val property.
- *
- */
- public void setVal(int value) {
- this.val = value;
- }
-
- public boolean isSetVal() {
- return true;
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPositivePercentage.java b/src/java/org/apache/poi/sl/draw/binding/CTPositivePercentage.java
deleted file mode 100644
index dc0afc4552..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTPositivePercentage.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_PositivePercentage complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_PositivePercentage"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;attribute name="val" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositivePercentage" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_PositivePercentage")
-public class CTPositivePercentage {
-
- @XmlAttribute(name = "val", required = true)
- protected int val;
-
- /**
- * Gets the value of the val property.
- *
- */
- public int getVal() {
- return val;
- }
-
- /**
- * Sets the value of the val property.
- *
- */
- public void setVal(int value) {
- this.val = value;
- }
-
- public boolean isSetVal() {
- return true;
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPositiveSize2D.java b/src/java/org/apache/poi/sl/draw/binding/CTPositiveSize2D.java
deleted file mode 100644
index 19d9e3e06b..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTPositiveSize2D.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_PositiveSize2D complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_PositiveSize2D"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;attribute name="cx" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveCoordinate" /&gt;
- * &lt;attribute name="cy" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveCoordinate" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_PositiveSize2D")
-public class CTPositiveSize2D {
-
- @XmlAttribute(name = "cx", required = true)
- protected long cx;
- @XmlAttribute(name = "cy", required = true)
- protected long cy;
-
- /**
- * Gets the value of the cx property.
- *
- */
- public long getCx() {
- return cx;
- }
-
- /**
- * Sets the value of the cx property.
- *
- */
- public void setCx(long value) {
- this.cx = value;
- }
-
- public boolean isSetCx() {
- return true;
- }
-
- /**
- * Gets the value of the cy property.
- *
- */
- public long getCy() {
- return cy;
- }
-
- /**
- * Sets the value of the cy property.
- *
- */
- public void setCy(long value) {
- this.cy = value;
- }
-
- public boolean isSetCy() {
- return true;
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPresetColor.java b/src/java/org/apache/poi/sl/draw/binding/CTPresetColor.java
deleted file mode 100644
index 246c6a2cd9..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTPresetColor.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_PresetColor complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_PresetColor"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;group ref="{http://schemas.openxmlformats.org/drawingml/2006/main}EG_ColorTransform" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;attribute name="val" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PresetColorVal" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_PresetColor", propOrder = {
- "egColorTransform"
-})
-public class CTPresetColor {
-
- @XmlElementRefs({
- @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false)
- })
- protected List<JAXBElement<?>> egColorTransform;
- @XmlAttribute(name = "val")
- protected STPresetColorVal val;
-
- /**
- * Gets the value of the egColorTransform property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the egColorTransform property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getEGColorTransform().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}
- * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- *
- *
- */
- public List<JAXBElement<?>> getEGColorTransform() {
- if (egColorTransform == null) {
- egColorTransform = new ArrayList<>();
- }
- return this.egColorTransform;
- }
-
- public boolean isSetEGColorTransform() {
- return ((this.egColorTransform!= null)&&(!this.egColorTransform.isEmpty()));
- }
-
- public void unsetEGColorTransform() {
- this.egColorTransform = null;
- }
-
- /**
- * Gets the value of the val property.
- *
- * @return
- * possible object is
- * {@link STPresetColorVal }
- *
- */
- public STPresetColorVal getVal() {
- return val;
- }
-
- /**
- * Sets the value of the val property.
- *
- * @param value
- * allowed object is
- * {@link STPresetColorVal }
- *
- */
- public void setVal(STPresetColorVal value) {
- this.val = value;
- }
-
- public boolean isSetVal() {
- return (this.val!= null);
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPresetGeometry2D.java b/src/java/org/apache/poi/sl/draw/binding/CTPresetGeometry2D.java
deleted file mode 100644
index 55566b4f5a..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTPresetGeometry2D.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_PresetGeometry2D complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_PresetGeometry2D"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="avLst" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_GeomGuideList" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;attribute name="prst" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_ShapeType" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_PresetGeometry2D", propOrder = {
- "avLst"
-})
-public class CTPresetGeometry2D {
-
- protected CTGeomGuideList avLst;
- @XmlAttribute(name = "prst", required = true)
- protected STShapeType prst;
-
- /**
- * Gets the value of the avLst property.
- *
- * @return
- * possible object is
- * {@link CTGeomGuideList }
- *
- */
- public CTGeomGuideList getAvLst() {
- return avLst;
- }
-
- /**
- * Sets the value of the avLst property.
- *
- * @param value
- * allowed object is
- * {@link CTGeomGuideList }
- *
- */
- public void setAvLst(CTGeomGuideList value) {
- this.avLst = value;
- }
-
- public boolean isSetAvLst() {
- return (this.avLst!= null);
- }
-
- /**
- * Gets the value of the prst property.
- *
- * @return
- * possible object is
- * {@link STShapeType }
- *
- */
- public STShapeType getPrst() {
- return prst;
- }
-
- /**
- * Sets the value of the prst property.
- *
- * @param value
- * allowed object is
- * {@link STShapeType }
- *
- */
- public void setPrst(STShapeType value) {
- this.prst = value;
- }
-
- public boolean isSetPrst() {
- return (this.prst!= null);
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPresetTextShape.java b/src/java/org/apache/poi/sl/draw/binding/CTPresetTextShape.java
deleted file mode 100644
index 05b0405a71..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTPresetTextShape.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_PresetTextShape complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_PresetTextShape"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="avLst" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_GeomGuideList" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;attribute name="prst" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_TextShapeType" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_PresetTextShape", propOrder = {
- "avLst"
-})
-public class CTPresetTextShape {
-
- protected CTGeomGuideList avLst;
- @XmlAttribute(name = "prst", required = true)
- protected STTextShapeType prst;
-
- /**
- * Gets the value of the avLst property.
- *
- * @return
- * possible object is
- * {@link CTGeomGuideList }
- *
- */
- public CTGeomGuideList getAvLst() {
- return avLst;
- }
-
- /**
- * Sets the value of the avLst property.
- *
- * @param value
- * allowed object is
- * {@link CTGeomGuideList }
- *
- */
- public void setAvLst(CTGeomGuideList value) {
- this.avLst = value;
- }
-
- public boolean isSetAvLst() {
- return (this.avLst!= null);
- }
-
- /**
- * Gets the value of the prst property.
- *
- * @return
- * possible object is
- * {@link STTextShapeType }
- *
- */
- public STTextShapeType getPrst() {
- return prst;
- }
-
- /**
- * Sets the value of the prst property.
- *
- * @param value
- * allowed object is
- * {@link STTextShapeType }
- *
- */
- public void setPrst(STTextShapeType value) {
- this.prst = value;
- }
-
- public boolean isSetPrst() {
- return (this.prst!= null);
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTRatio.java b/src/java/org/apache/poi/sl/draw/binding/CTRatio.java
deleted file mode 100644
index f9df00dfd6..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTRatio.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Ratio complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_Ratio"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;attribute name="n" use="required" type="{http://www.w3.org/2001/XMLSchema}long" /&gt;
- * &lt;attribute name="d" use="required" type="{http://www.w3.org/2001/XMLSchema}long" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Ratio")
-public class CTRatio {
-
- @XmlAttribute(name = "n", required = true)
- protected long n;
- @XmlAttribute(name = "d", required = true)
- protected long d;
-
- /**
- * Gets the value of the n property.
- *
- */
- public long getN() {
- return n;
- }
-
- /**
- * Sets the value of the n property.
- *
- */
- public void setN(long value) {
- this.n = value;
- }
-
- public boolean isSetN() {
- return true;
- }
-
- /**
- * Gets the value of the d property.
- *
- */
- public long getD() {
- return d;
- }
-
- /**
- * Sets the value of the d property.
- *
- */
- public void setD(long value) {
- this.d = value;
- }
-
- public boolean isSetD() {
- return true;
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTRelativeRect.java b/src/java/org/apache/poi/sl/draw/binding/CTRelativeRect.java
deleted file mode 100644
index 719fbbb17e..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTRelativeRect.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_RelativeRect complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_RelativeRect"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;attribute name="l" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage" default="0" /&gt;
- * &lt;attribute name="t" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage" default="0" /&gt;
- * &lt;attribute name="r" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage" default="0" /&gt;
- * &lt;attribute name="b" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage" default="0" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_RelativeRect")
-public class CTRelativeRect {
-
- @XmlAttribute(name = "l")
- protected Integer l;
- @XmlAttribute(name = "t")
- protected Integer t;
- @XmlAttribute(name = "r")
- protected Integer r;
- @XmlAttribute(name = "b")
- protected Integer b;
-
- /**
- * Gets the value of the l property.
- *
- * @return
- * possible object is
- * {@link Integer }
- *
- */
- public int getL() {
- if (l == null) {
- return 0;
- } else {
- return l;
- }
- }
-
- /**
- * Sets the value of the l property.
- *
- * @param value
- * allowed object is
- * {@link Integer }
- *
- */
- public void setL(int value) {
- this.l = value;
- }
-
- public boolean isSetL() {
- return (this.l!= null);
- }
-
- public void unsetL() {
- this.l = null;
- }
-
- /**
- * Gets the value of the t property.
- *
- * @return
- * possible object is
- * {@link Integer }
- *
- */
- public int getT() {
- if (t == null) {
- return 0;
- } else {
- return t;
- }
- }
-
- /**
- * Sets the value of the t property.
- *
- * @param value
- * allowed object is
- * {@link Integer }
- *
- */
- public void setT(int value) {
- this.t = value;
- }
-
- public boolean isSetT() {
- return (this.t!= null);
- }
-
- public void unsetT() {
- this.t = null;
- }
-
- /**
- * Gets the value of the r property.
- *
- * @return
- * possible object is
- * {@link Integer }
- *
- */
- public int getR() {
- if (r == null) {
- return 0;
- } else {
- return r;
- }
- }
-
- /**
- * Sets the value of the r property.
- *
- * @param value
- * allowed object is
- * {@link Integer }
- *
- */
- public void setR(int value) {
- this.r = value;
- }
-
- public boolean isSetR() {
- return (this.r!= null);
- }
-
- public void unsetR() {
- this.r = null;
- }
-
- /**
- * Gets the value of the b property.
- *
- * @return
- * possible object is
- * {@link Integer }
- *
- */
- public int getB() {
- if (b == null) {
- return 0;
- } else {
- return b;
- }
- }
-
- /**
- * Sets the value of the b property.
- *
- * @param value
- * allowed object is
- * {@link Integer }
- *
- */
- public void setB(int value) {
- this.b = value;
- }
-
- public boolean isSetB() {
- return (this.b!= null);
- }
-
- public void unsetB() {
- this.b = null;
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTSRgbColor.java b/src/java/org/apache/poi/sl/draw/binding/CTSRgbColor.java
deleted file mode 100644
index 64555df0c1..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTSRgbColor.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.HexBinaryAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for CT_SRgbColor complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_SRgbColor"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;group ref="{http://schemas.openxmlformats.org/drawingml/2006/main}EG_ColorTransform" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;attribute name="val" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_HexBinary3" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_SRgbColor", propOrder = {
- "egColorTransform"
-})
-public class CTSRgbColor {
-
- @XmlElementRefs({
- @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false)
- })
- protected List<JAXBElement<?>> egColorTransform;
- @XmlAttribute(name = "val", required = true)
- @XmlJavaTypeAdapter(HexBinaryAdapter.class)
- protected byte[] val;
-
- /**
- * Gets the value of the egColorTransform property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the egColorTransform property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getEGColorTransform().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}
- * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- *
- *
- */
- public List<JAXBElement<?>> getEGColorTransform() {
- if (egColorTransform == null) {
- egColorTransform = new ArrayList<>();
- }
- return this.egColorTransform;
- }
-
- public boolean isSetEGColorTransform() {
- return ((this.egColorTransform!= null)&&(!this.egColorTransform.isEmpty()));
- }
-
- public void unsetEGColorTransform() {
- this.egColorTransform = null;
- }
-
- /**
- * Gets the value of the val property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public byte[] getVal() {
- return val;
- }
-
- /**
- * Sets the value of the val property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setVal(byte[] value) {
- this.val = value;
- }
-
- public boolean isSetVal() {
- return (this.val!= null);
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTScRgbColor.java b/src/java/org/apache/poi/sl/draw/binding/CTScRgbColor.java
deleted file mode 100644
index 7cdc926075..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTScRgbColor.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_ScRgbColor complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_ScRgbColor"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;group ref="{http://schemas.openxmlformats.org/drawingml/2006/main}EG_ColorTransform" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;attribute name="r" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage" /&gt;
- * &lt;attribute name="g" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage" /&gt;
- * &lt;attribute name="b" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_ScRgbColor", propOrder = {
- "egColorTransform"
-})
-public class CTScRgbColor {
-
- @XmlElementRefs({
- @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false)
- })
- protected List<JAXBElement<?>> egColorTransform;
- @XmlAttribute(name = "r", required = true)
- protected int r;
- @XmlAttribute(name = "g", required = true)
- protected int g;
- @XmlAttribute(name = "b", required = true)
- protected int b;
-
- /**
- * Gets the value of the egColorTransform property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the egColorTransform property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getEGColorTransform().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- *
- *
- */
- public List<JAXBElement<?>> getEGColorTransform() {
- if (egColorTransform == null) {
- egColorTransform = new ArrayList<>();
- }
- return this.egColorTransform;
- }
-
- public boolean isSetEGColorTransform() {
- return ((this.egColorTransform!= null)&&(!this.egColorTransform.isEmpty()));
- }
-
- public void unsetEGColorTransform() {
- this.egColorTransform = null;
- }
-
- /**
- * Gets the value of the r property.
- *
- */
- public int getR() {
- return r;
- }
-
- /**
- * Sets the value of the r property.
- *
- */
- public void setR(int value) {
- this.r = value;
- }
-
- public boolean isSetR() {
- return true;
- }
-
- /**
- * Gets the value of the g property.
- *
- */
- public int getG() {
- return g;
- }
-
- /**
- * Sets the value of the g property.
- *
- */
- public void setG(int value) {
- this.g = value;
- }
-
- public boolean isSetG() {
- return true;
- }
-
- /**
- * Gets the value of the b property.
- *
- */
- public int getB() {
- return b;
- }
-
- /**
- * Sets the value of the b property.
- *
- */
- public void setB(int value) {
- this.b = value;
- }
-
- public boolean isSetB() {
- return true;
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTScale2D.java b/src/java/org/apache/poi/sl/draw/binding/CTScale2D.java
deleted file mode 100644
index 468b7f5160..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTScale2D.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Scale2D complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_Scale2D"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="sx" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Ratio"/&gt;
- * &lt;element name="sy" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Ratio"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Scale2D", propOrder = {
- "sx",
- "sy"
-})
-public class CTScale2D {
-
- @XmlElement(required = true)
- protected CTRatio sx;
- @XmlElement(required = true)
- protected CTRatio sy;
-
- /**
- * Gets the value of the sx property.
- *
- * @return
- * possible object is
- * {@link CTRatio }
- *
- */
- public CTRatio getSx() {
- return sx;
- }
-
- /**
- * Sets the value of the sx property.
- *
- * @param value
- * allowed object is
- * {@link CTRatio }
- *
- */
- public void setSx(CTRatio value) {
- this.sx = value;
- }
-
- public boolean isSetSx() {
- return (this.sx!= null);
- }
-
- /**
- * Gets the value of the sy property.
- *
- * @return
- * possible object is
- * {@link CTRatio }
- *
- */
- public CTRatio getSy() {
- return sy;
- }
-
- /**
- * Sets the value of the sy property.
- *
- * @param value
- * allowed object is
- * {@link CTRatio }
- *
- */
- public void setSy(CTRatio value) {
- this.sy = value;
- }
-
- public boolean isSetSy() {
- return (this.sy!= null);
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTSchemeColor.java b/src/java/org/apache/poi/sl/draw/binding/CTSchemeColor.java
deleted file mode 100644
index 0de9165f22..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTSchemeColor.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_SchemeColor complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_SchemeColor"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;group ref="{http://schemas.openxmlformats.org/drawingml/2006/main}EG_ColorTransform" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;attribute name="val" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_SchemeColorVal" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_SchemeColor", propOrder = {
- "egColorTransform"
-})
-public class CTSchemeColor {
-
- @XmlElementRefs({
- @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false)
- })
- protected List<JAXBElement<?>> egColorTransform;
- @XmlAttribute(name = "val", required = true)
- protected STSchemeColorVal val;
-
- /**
- * Gets the value of the egColorTransform property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the egColorTransform property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getEGColorTransform().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}
- * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- *
- *
- */
- public List<JAXBElement<?>> getEGColorTransform() {
- if (egColorTransform == null) {
- egColorTransform = new ArrayList<>();
- }
- return this.egColorTransform;
- }
-
- public boolean isSetEGColorTransform() {
- return ((this.egColorTransform!= null)&&(!this.egColorTransform.isEmpty()));
- }
-
- public void unsetEGColorTransform() {
- this.egColorTransform = null;
- }
-
- /**
- * Gets the value of the val property.
- *
- * @return
- * possible object is
- * {@link STSchemeColorVal }
- *
- */
- public STSchemeColorVal getVal() {
- return val;
- }
-
- /**
- * Sets the value of the val property.
- *
- * @param value
- * allowed object is
- * {@link STSchemeColorVal }
- *
- */
- public void setVal(STSchemeColorVal value) {
- this.val = value;
- }
-
- public boolean isSetVal() {
- return (this.val!= null);
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTSphereCoords.java b/src/java/org/apache/poi/sl/draw/binding/CTSphereCoords.java
deleted file mode 100644
index 1be9bcc8f2..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTSphereCoords.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_SphereCoords complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_SphereCoords"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;attribute name="lat" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveFixedAngle" /&gt;
- * &lt;attribute name="lon" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveFixedAngle" /&gt;
- * &lt;attribute name="rev" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveFixedAngle" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_SphereCoords")
-public class CTSphereCoords {
-
- @XmlAttribute(name = "lat", required = true)
- protected int lat;
- @XmlAttribute(name = "lon", required = true)
- protected int lon;
- @XmlAttribute(name = "rev", required = true)
- protected int rev;
-
- /**
- * Gets the value of the lat property.
- *
- */
- public int getLat() {
- return lat;
- }
-
- /**
- * Sets the value of the lat property.
- *
- */
- public void setLat(int value) {
- this.lat = value;
- }
-
- public boolean isSetLat() {
- return true;
- }
-
- /**
- * Gets the value of the lon property.
- *
- */
- public int getLon() {
- return lon;
- }
-
- /**
- * Sets the value of the lon property.
- *
- */
- public void setLon(int value) {
- this.lon = value;
- }
-
- public boolean isSetLon() {
- return true;
- }
-
- /**
- * Gets the value of the rev property.
- *
- */
- public int getRev() {
- return rev;
- }
-
- /**
- * Sets the value of the rev property.
- *
- */
- public void setRev(int value) {
- this.rev = value;
- }
-
- public boolean isSetRev() {
- return true;
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTSystemColor.java b/src/java/org/apache/poi/sl/draw/binding/CTSystemColor.java
deleted file mode 100644
index 88bb0113f8..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTSystemColor.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.HexBinaryAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for CT_SystemColor complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_SystemColor"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;group ref="{http://schemas.openxmlformats.org/drawingml/2006/main}EG_ColorTransform" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;attribute name="val" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_SystemColorVal" /&gt;
- * &lt;attribute name="lastClr" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_HexBinary3" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_SystemColor", propOrder = {
- "egColorTransform"
-})
-public class CTSystemColor {
-
- @XmlElementRefs({
- @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false),
- @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", type = JAXBElement.class, required = false)
- })
- protected List<JAXBElement<?>> egColorTransform;
- @XmlAttribute(name = "val", required = true)
- @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
- protected String val;
- @XmlAttribute(name = "lastClr")
- @XmlJavaTypeAdapter(HexBinaryAdapter.class)
- protected byte[] lastClr;
-
- /**
- * Gets the value of the egColorTransform property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the egColorTransform property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getEGColorTransform().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTAngle }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}
- *
- *
- */
- public List<JAXBElement<?>> getEGColorTransform() {
- if (egColorTransform == null) {
- egColorTransform = new ArrayList<>();
- }
- return this.egColorTransform;
- }
-
- public boolean isSetEGColorTransform() {
- return ((this.egColorTransform!= null)&&(!this.egColorTransform.isEmpty()));
- }
-
- public void unsetEGColorTransform() {
- this.egColorTransform = null;
- }
-
- /**
- * Gets the value of the val property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getVal() {
- return val;
- }
-
- /**
- * Sets the value of the val property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setVal(String value) {
- this.val = value;
- }
-
- public boolean isSetVal() {
- return (this.val!= null);
- }
-
- /**
- * Gets the value of the lastClr property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public byte[] getLastClr() {
- return lastClr;
- }
-
- /**
- * Sets the value of the lastClr property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setLastClr(byte[] value) {
- this.lastClr = value;
- }
-
- public boolean isSetLastClr() {
- return (this.lastClr!= null);
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTTransform2D.java b/src/java/org/apache/poi/sl/draw/binding/CTTransform2D.java
deleted file mode 100644
index 88a48cd8af..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTTransform2D.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Transform2D complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_Transform2D"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="off" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Point2D" minOccurs="0"/&gt;
- * &lt;element name="ext" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_PositiveSize2D" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;attribute name="rot" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Angle" default="0" /&gt;
- * &lt;attribute name="flipH" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&gt;
- * &lt;attribute name="flipV" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Transform2D", propOrder = {
- "off",
- "ext"
-})
-public class CTTransform2D {
-
- protected CTPoint2D off;
- protected CTPositiveSize2D ext;
- @XmlAttribute(name = "rot")
- protected Integer rot;
- @XmlAttribute(name = "flipH")
- protected Boolean flipH;
- @XmlAttribute(name = "flipV")
- protected Boolean flipV;
-
- /**
- * Gets the value of the off property.
- *
- * @return
- * possible object is
- * {@link CTPoint2D }
- *
- */
- public CTPoint2D getOff() {
- return off;
- }
-
- /**
- * Sets the value of the off property.
- *
- * @param value
- * allowed object is
- * {@link CTPoint2D }
- *
- */
- public void setOff(CTPoint2D value) {
- this.off = value;
- }
-
- public boolean isSetOff() {
- return (this.off!= null);
- }
-
- /**
- * Gets the value of the ext property.
- *
- * @return
- * possible object is
- * {@link CTPositiveSize2D }
- *
- */
- public CTPositiveSize2D getExt() {
- return ext;
- }
-
- /**
- * Sets the value of the ext property.
- *
- * @param value
- * allowed object is
- * {@link CTPositiveSize2D }
- *
- */
- public void setExt(CTPositiveSize2D value) {
- this.ext = value;
- }
-
- public boolean isSetExt() {
- return (this.ext!= null);
- }
-
- /**
- * Gets the value of the rot property.
- *
- * @return
- * possible object is
- * {@link Integer }
- *
- */
- public int getRot() {
- if (rot == null) {
- return 0;
- } else {
- return rot;
- }
- }
-
- /**
- * Sets the value of the rot property.
- *
- * @param value
- * allowed object is
- * {@link Integer }
- *
- */
- public void setRot(int value) {
- this.rot = value;
- }
-
- public boolean isSetRot() {
- return (this.rot!= null);
- }
-
- public void unsetRot() {
- this.rot = null;
- }
-
- /**
- * Gets the value of the flipH property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public boolean isFlipH() {
- if (flipH == null) {
- return false;
- } else {
- return flipH;
- }
- }
-
- /**
- * Sets the value of the flipH property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- public void setFlipH(boolean value) {
- this.flipH = value;
- }
-
- public boolean isSetFlipH() {
- return (this.flipH!= null);
- }
-
- public void unsetFlipH() {
- this.flipH = null;
- }
-
- /**
- * Gets the value of the flipV property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public boolean isFlipV() {
- if (flipV == null) {
- return false;
- } else {
- return flipV;
- }
- }
-
- /**
- * Sets the value of the flipV property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- public void setFlipV(boolean value) {
- this.flipV = value;
- }
-
- public boolean isSetFlipV() {
- return (this.flipV!= null);
- }
-
- public void unsetFlipV() {
- this.flipV = null;
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTVector3D.java b/src/java/org/apache/poi/sl/draw/binding/CTVector3D.java
deleted file mode 100644
index 9c447c548d..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/CTVector3D.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CT_Vector3D complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="CT_Vector3D"&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;attribute name="dx" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate" /&gt;
- * &lt;attribute name="dy" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate" /&gt;
- * &lt;attribute name="dz" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate" /&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Vector3D")
-public class CTVector3D {
-
- @XmlAttribute(name = "dx", required = true)
- protected long dx;
- @XmlAttribute(name = "dy", required = true)
- protected long dy;
- @XmlAttribute(name = "dz", required = true)
- protected long dz;
-
- /**
- * Gets the value of the dx property.
- *
- */
- public long getDx() {
- return dx;
- }
-
- /**
- * Sets the value of the dx property.
- *
- */
- public void setDx(long value) {
- this.dx = value;
- }
-
- public boolean isSetDx() {
- return true;
- }
-
- /**
- * Gets the value of the dy property.
- *
- */
- public long getDy() {
- return dy;
- }
-
- /**
- * Sets the value of the dy property.
- *
- */
- public void setDy(long value) {
- this.dy = value;
- }
-
- public boolean isSetDy() {
- return true;
- }
-
- /**
- * Gets the value of the dz property.
- *
- */
- public long getDz() {
- return dz;
- }
-
- /**
- * Sets the value of the dz property.
- *
- */
- public void setDz(long value) {
- this.dz = value;
- }
-
- public boolean isSetDz() {
- return true;
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/ObjectFactory.java b/src/java/org/apache/poi/sl/draw/binding/ObjectFactory.java
deleted file mode 100644
index fc244e9597..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/ObjectFactory.java
+++ /dev/null
@@ -1,2024 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each
- * Java content interface and Java element interface
- * generated in the org.apache.poi.sl.draw.binding package.
- * <p>An ObjectFactory allows you to programatically
- * construct new instances of the Java representation
- * for XML content. The Java representation of XML
- * content can consist of schema derived interfaces
- * and classes representing the binding of schema
- * type definitions, element declarations and model
- * groups. Factory methods for each of these are
- * provided in this class.
- *
- */
-@SuppressWarnings("unused")
-@XmlRegistry
-public class ObjectFactory {
-
- private final static QName _CTScRgbColorInv_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "inv");
- private final static QName _CTScRgbColorLumMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "lumMod");
- private final static QName _CTScRgbColorBlue_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "blue");
- private final static QName _CTScRgbColorRedMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "redMod");
- private final static QName _CTScRgbColorSatMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "satMod");
- private final static QName _CTScRgbColorHue_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "hue");
- private final static QName _CTScRgbColorBlueOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "blueOff");
- private final static QName _CTScRgbColorHueMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "hueMod");
- private final static QName _CTScRgbColorAlphaMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "alphaMod");
- private final static QName _CTScRgbColorGamma_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "gamma");
- private final static QName _CTScRgbColorComp_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "comp");
- private final static QName _CTScRgbColorSatOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "satOff");
- private final static QName _CTScRgbColorGreen_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "green");
- private final static QName _CTScRgbColorLumOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "lumOff");
- private final static QName _CTScRgbColorSat_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "sat");
- private final static QName _CTScRgbColorShade_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "shade");
- private final static QName _CTScRgbColorRed_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "red");
- private final static QName _CTScRgbColorGray_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "gray");
- private final static QName _CTScRgbColorAlpha_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "alpha");
- private final static QName _CTScRgbColorGreenOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "greenOff");
- private final static QName _CTScRgbColorRedOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "redOff");
- private final static QName _CTScRgbColorHueOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "hueOff");
- private final static QName _CTScRgbColorLum_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "lum");
- private final static QName _CTScRgbColorBlueMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "blueMod");
- private final static QName _CTScRgbColorGreenMod_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "greenMod");
- private final static QName _CTScRgbColorAlphaOff_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "alphaOff");
- private final static QName _CTScRgbColorTint_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "tint");
- private final static QName _CTScRgbColorInvGamma_QNAME = new QName("http://schemas.openxmlformats.org/drawingml/2006/main", "invGamma");
-
- /**
- * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.poi.sl.draw.binding
- *
- */
- public ObjectFactory() {
- }
-
- /**
- * Create an instance of {@link CTPath2DArcTo }
- *
- */
- public CTPath2DArcTo createCTPath2DArcTo() {
- return new CTPath2DArcTo();
- }
-
- /**
- * Create an instance of {@link CTAdjPoint2D }
- *
- */
- public CTAdjPoint2D createCTAdjPoint2D() {
- return new CTAdjPoint2D();
- }
-
- /**
- * Create an instance of {@link CTColorMRU }
- *
- */
- public CTColorMRU createCTColorMRU() {
- return new CTColorMRU();
- }
-
- /**
- * Create an instance of {@link CTConnection }
- *
- */
- public CTConnection createCTConnection() {
- return new CTConnection();
- }
-
- /**
- * Create an instance of {@link CTInverseTransform }
- *
- */
- public CTInverseTransform createCTInverseTransform() {
- return new CTInverseTransform();
- }
-
- /**
- * Create an instance of {@link CTPoint3D }
- *
- */
- public CTPoint3D createCTPoint3D() {
- return new CTPoint3D();
- }
-
- /**
- * Create an instance of {@link CTPositiveSize2D }
- *
- */
- public CTPositiveSize2D createCTPositiveSize2D() {
- return new CTPositiveSize2D();
- }
-
- /**
- * Create an instance of {@link CTColor }
- *
- */
- public CTColor createCTColor() {
- return new CTColor();
- }
-
- /**
- * Create an instance of {@link CTComplementTransform }
- *
- */
- public CTComplementTransform createCTComplementTransform() {
- return new CTComplementTransform();
- }
-
- /**
- * Create an instance of {@link CTCustomGeometry2D }
- *
- */
- public CTCustomGeometry2D createCTCustomGeometry2D() {
- return new CTCustomGeometry2D();
- }
-
- /**
- * Create an instance of {@link CTRelativeRect }
- *
- */
- public CTRelativeRect createCTRelativeRect() {
- return new CTRelativeRect();
- }
-
- /**
- * Create an instance of {@link CTHslColor }
- *
- */
- public CTHslColor createCTHslColor() {
- return new CTHslColor();
- }
-
- /**
- * Create an instance of {@link CTPercentage }
- *
- */
- public CTPercentage createCTPercentage() {
- return new CTPercentage();
- }
-
- /**
- * Create an instance of {@link CTInverseGammaTransform }
- *
- */
- public CTInverseGammaTransform createCTInverseGammaTransform() {
- return new CTInverseGammaTransform();
- }
-
- /**
- * Create an instance of {@link CTPath2DMoveTo }
- *
- */
- public CTPath2DMoveTo createCTPath2DMoveTo() {
- return new CTPath2DMoveTo();
- }
-
- /**
- * Create an instance of {@link CTPresetColor }
- *
- */
- public CTPresetColor createCTPresetColor() {
- return new CTPresetColor();
- }
-
- /**
- * Create an instance of {@link CTGrayscaleTransform }
- *
- */
- public CTGrayscaleTransform createCTGrayscaleTransform() {
- return new CTGrayscaleTransform();
- }
-
- /**
- * Create an instance of {@link CTPositiveFixedAngle }
- *
- */
- public CTPositiveFixedAngle createCTPositiveFixedAngle() {
- return new CTPositiveFixedAngle();
- }
-
- /**
- * Create an instance of {@link CTPolarAdjustHandle }
- *
- */
- public CTPolarAdjustHandle createCTPolarAdjustHandle() {
- return new CTPolarAdjustHandle();
- }
-
- /**
- * Create an instance of {@link CTPath2D }
- *
- */
- public CTPath2D createCTPath2D() {
- return new CTPath2D();
- }
-
- /**
- * Create an instance of {@link CTPresetTextShape }
- *
- */
- public CTPresetTextShape createCTPresetTextShape() {
- return new CTPresetTextShape();
- }
-
- /**
- * Create an instance of {@link CTAdjustHandleList }
- *
- */
- public CTAdjustHandleList createCTAdjustHandleList() {
- return new CTAdjustHandleList();
- }
-
- /**
- * Create an instance of {@link CTScRgbColor }
- *
- */
- public CTScRgbColor createCTScRgbColor() {
- return new CTScRgbColor();
- }
-
- /**
- * Create an instance of {@link CTPath2DClose }
- *
- */
- public CTPath2DClose createCTPath2DClose() {
- return new CTPath2DClose();
- }
-
- /**
- * Create an instance of {@link CTPath2DLineTo }
- *
- */
- public CTPath2DLineTo createCTPath2DLineTo() {
- return new CTPath2DLineTo();
- }
-
- /**
- * Create an instance of {@link CTPath2DList }
- *
- */
- public CTPath2DList createCTPath2DList() {
- return new CTPath2DList();
- }
-
- /**
- * Create an instance of {@link CTAngle }
- *
- */
- public CTAngle createCTAngle() {
- return new CTAngle();
- }
-
- /**
- * Create an instance of {@link CTSchemeColor }
- *
- */
- public CTSchemeColor createCTSchemeColor() {
- return new CTSchemeColor();
- }
-
- /**
- * Create an instance of {@link CTGeomGuide }
- *
- */
- public CTGeomGuide createCTGeomGuide() {
- return new CTGeomGuide();
- }
-
- /**
- * Create an instance of {@link CTGroupTransform2D }
- *
- */
- public CTGroupTransform2D createCTGroupTransform2D() {
- return new CTGroupTransform2D();
- }
-
- /**
- * Create an instance of {@link CTConnectionSiteList }
- *
- */
- public CTConnectionSiteList createCTConnectionSiteList() {
- return new CTConnectionSiteList();
- }
-
- /**
- * Create an instance of {@link CTConnectionSite }
- *
- */
- public CTConnectionSite createCTConnectionSite() {
- return new CTConnectionSite();
- }
-
- /**
- * Create an instance of {@link CTXYAdjustHandle }
- *
- */
- public CTXYAdjustHandle createCTXYAdjustHandle() {
- return new CTXYAdjustHandle();
- }
-
- /**
- * Create an instance of {@link CTSystemColor }
- *
- */
- public CTSystemColor createCTSystemColor() {
- return new CTSystemColor();
- }
-
- /**
- * Create an instance of {@link CTPath2DCubicBezierTo }
- *
- */
- public CTPath2DCubicBezierTo createCTPath2DCubicBezierTo() {
- return new CTPath2DCubicBezierTo();
- }
-
- /**
- * Create an instance of {@link CTPath2DQuadBezierTo }
- *
- */
- public CTPath2DQuadBezierTo createCTPath2DQuadBezierTo() {
- return new CTPath2DQuadBezierTo();
- }
-
- /**
- * Create an instance of {@link CTRatio }
- *
- */
- public CTRatio createCTRatio() {
- return new CTRatio();
- }
-
- /**
- * Create an instance of {@link CTGeomRect }
- *
- */
- public CTGeomRect createCTGeomRect() {
- return new CTGeomRect();
- }
-
- /**
- * Create an instance of {@link CTGammaTransform }
- *
- */
- public CTGammaTransform createCTGammaTransform() {
- return new CTGammaTransform();
- }
-
- /**
- * Create an instance of {@link CTPoint2D }
- *
- */
- public CTPoint2D createCTPoint2D() {
- return new CTPoint2D();
- }
-
- /**
- * Create an instance of {@link CTSRgbColor }
- *
- */
- public CTSRgbColor createCTSRgbColor() {
- return new CTSRgbColor();
- }
-
- /**
- * Create an instance of {@link CTTransform2D }
- *
- */
- public CTTransform2D createCTTransform2D() {
- return new CTTransform2D();
- }
-
- /**
- * Create an instance of {@link CTPresetGeometry2D }
- *
- */
- public CTPresetGeometry2D createCTPresetGeometry2D() {
- return new CTPresetGeometry2D();
- }
-
- /**
- * Create an instance of {@link CTOfficeArtExtension }
- *
- */
- public CTOfficeArtExtension createCTOfficeArtExtension() {
- return new CTOfficeArtExtension();
- }
-
- /**
- * Create an instance of {@link CTGeomGuideList }
- *
- */
- public CTGeomGuideList createCTGeomGuideList() {
- return new CTGeomGuideList();
- }
-
- /**
- * Create an instance of {@link CTScale2D }
- *
- */
- public CTScale2D createCTScale2D() {
- return new CTScale2D();
- }
-
- /**
- * Create an instance of {@link CTPositiveFixedPercentage }
- *
- */
- public CTPositiveFixedPercentage createCTPositiveFixedPercentage() {
- return new CTPositiveFixedPercentage();
- }
-
- /**
- * Create an instance of {@link CTSphereCoords }
- *
- */
- public CTSphereCoords createCTSphereCoords() {
- return new CTSphereCoords();
- }
-
- /**
- * Create an instance of {@link CTPositivePercentage }
- *
- */
- public CTPositivePercentage createCTPositivePercentage() {
- return new CTPositivePercentage();
- }
-
- /**
- * Create an instance of {@link CTVector3D }
- *
- */
- public CTVector3D createCTVector3D() {
- return new CTVector3D();
- }
-
- /**
- * Create an instance of {@link CTEmbeddedWAVAudioFile }
- *
- */
- public CTEmbeddedWAVAudioFile createCTEmbeddedWAVAudioFile() {
- return new CTEmbeddedWAVAudioFile();
- }
-
- /**
- * Create an instance of {@link CTFixedPercentage }
- *
- */
- public CTFixedPercentage createCTFixedPercentage() {
- return new CTFixedPercentage();
- }
-
- /**
- * Create an instance of {@link CTHyperlink }
- *
- */
- public CTHyperlink createCTHyperlink() {
- return new CTHyperlink();
- }
-
- /**
- * Create an instance of {@link CTOfficeArtExtensionList }
- *
- */
- public CTOfficeArtExtensionList createCTOfficeArtExtensionList() {
- return new CTOfficeArtExtensionList();
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTScRgbColor.class)
- public JAXBElement<CTInverseTransform> createCTScRgbColorInv(CTInverseTransform value) {
- return new JAXBElement<>(_CTScRgbColorInv_QNAME, CTInverseTransform.class, CTScRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTScRgbColor.class)
- public JAXBElement<CTPercentage> createCTScRgbColorLumMod(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorLumMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTScRgbColor.class)
- public JAXBElement<CTPercentage> createCTScRgbColorBlue(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorBlue_QNAME, CTPercentage.class, CTScRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTScRgbColor.class)
- public JAXBElement<CTPercentage> createCTScRgbColorRedMod(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorRedMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTScRgbColor.class)
- public JAXBElement<CTPercentage> createCTScRgbColorSatMod(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorSatMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTScRgbColor.class)
- public JAXBElement<CTPositiveFixedAngle> createCTScRgbColorHue(CTPositiveFixedAngle value) {
- return new JAXBElement<>(_CTScRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTScRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTScRgbColor.class)
- public JAXBElement<CTPercentage> createCTScRgbColorBlueOff(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorBlueOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTScRgbColor.class)
- public JAXBElement<CTPositivePercentage> createCTScRgbColorHueMod(CTPositivePercentage value) {
- return new JAXBElement<>(_CTScRgbColorHueMod_QNAME, CTPositivePercentage.class, CTScRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTScRgbColor.class)
- public JAXBElement<CTPositivePercentage> createCTScRgbColorAlphaMod(CTPositivePercentage value) {
- return new JAXBElement<>(_CTScRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTScRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTScRgbColor.class)
- public JAXBElement<CTGammaTransform> createCTScRgbColorGamma(CTGammaTransform value) {
- return new JAXBElement<>(_CTScRgbColorGamma_QNAME, CTGammaTransform.class, CTScRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTScRgbColor.class)
- public JAXBElement<CTComplementTransform> createCTScRgbColorComp(CTComplementTransform value) {
- return new JAXBElement<>(_CTScRgbColorComp_QNAME, CTComplementTransform.class, CTScRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTScRgbColor.class)
- public JAXBElement<CTPercentage> createCTScRgbColorSatOff(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorSatOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTScRgbColor.class)
- public JAXBElement<CTPercentage> createCTScRgbColorGreen(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorGreen_QNAME, CTPercentage.class, CTScRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTScRgbColor.class)
- public JAXBElement<CTPercentage> createCTScRgbColorLumOff(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorLumOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTScRgbColor.class)
- public JAXBElement<CTPercentage> createCTScRgbColorSat(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorSat_QNAME, CTPercentage.class, CTScRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTScRgbColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTScRgbColorShade(CTPositiveFixedPercentage value) {
- return new JAXBElement<>(_CTScRgbColorShade_QNAME, CTPositiveFixedPercentage.class, CTScRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTScRgbColor.class)
- public JAXBElement<CTPercentage> createCTScRgbColorRed(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorRed_QNAME, CTPercentage.class, CTScRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTScRgbColor.class)
- public JAXBElement<CTGrayscaleTransform> createCTScRgbColorGray(CTGrayscaleTransform value) {
- return new JAXBElement<>(_CTScRgbColorGray_QNAME, CTGrayscaleTransform.class, CTScRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTScRgbColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTScRgbColorAlpha(CTPositiveFixedPercentage value) {
- return new JAXBElement<>(_CTScRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTScRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTScRgbColor.class)
- public JAXBElement<CTPercentage> createCTScRgbColorGreenOff(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorGreenOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTScRgbColor.class)
- public JAXBElement<CTPercentage> createCTScRgbColorRedOff(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorRedOff_QNAME, CTPercentage.class, CTScRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTScRgbColor.class)
- public JAXBElement<CTAngle> createCTScRgbColorHueOff(CTAngle value) {
- return new JAXBElement<>(_CTScRgbColorHueOff_QNAME, CTAngle.class, CTScRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTScRgbColor.class)
- public JAXBElement<CTPercentage> createCTScRgbColorLum(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorLum_QNAME, CTPercentage.class, CTScRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTScRgbColor.class)
- public JAXBElement<CTPercentage> createCTScRgbColorBlueMod(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorBlueMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTScRgbColor.class)
- public JAXBElement<CTPercentage> createCTScRgbColorGreenMod(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorGreenMod_QNAME, CTPercentage.class, CTScRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTScRgbColor.class)
- public JAXBElement<CTFixedPercentage> createCTScRgbColorAlphaOff(CTFixedPercentage value) {
- return new JAXBElement<>(_CTScRgbColorAlphaOff_QNAME, CTFixedPercentage.class, CTScRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTScRgbColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTScRgbColorTint(CTPositiveFixedPercentage value) {
- return new JAXBElement<>(_CTScRgbColorTint_QNAME, CTPositiveFixedPercentage.class, CTScRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTScRgbColor.class)
- public JAXBElement<CTInverseGammaTransform> createCTScRgbColorInvGamma(CTInverseGammaTransform value) {
- return new JAXBElement<>(_CTScRgbColorInvGamma_QNAME, CTInverseGammaTransform.class, CTScRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTPresetColor.class)
- public JAXBElement<CTInverseTransform> createCTPresetColorInv(CTInverseTransform value) {
- return new JAXBElement<>(_CTScRgbColorInv_QNAME, CTInverseTransform.class, CTPresetColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTPresetColor.class)
- public JAXBElement<CTPercentage> createCTPresetColorLumMod(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorLumMod_QNAME, CTPercentage.class, CTPresetColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTPresetColor.class)
- public JAXBElement<CTPercentage> createCTPresetColorBlue(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorBlue_QNAME, CTPercentage.class, CTPresetColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTPresetColor.class)
- public JAXBElement<CTPercentage> createCTPresetColorRedMod(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorRedMod_QNAME, CTPercentage.class, CTPresetColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTPresetColor.class)
- public JAXBElement<CTPercentage> createCTPresetColorSatMod(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorSatMod_QNAME, CTPercentage.class, CTPresetColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTPresetColor.class)
- public JAXBElement<CTPositiveFixedAngle> createCTPresetColorHue(CTPositiveFixedAngle value) {
- return new JAXBElement<>(_CTScRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTPresetColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTPresetColor.class)
- public JAXBElement<CTPercentage> createCTPresetColorBlueOff(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorBlueOff_QNAME, CTPercentage.class, CTPresetColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTPresetColor.class)
- public JAXBElement<CTPositivePercentage> createCTPresetColorHueMod(CTPositivePercentage value) {
- return new JAXBElement<>(_CTScRgbColorHueMod_QNAME, CTPositivePercentage.class, CTPresetColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTPresetColor.class)
- public JAXBElement<CTPositivePercentage> createCTPresetColorAlphaMod(CTPositivePercentage value) {
- return new JAXBElement<>(_CTScRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTPresetColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTPresetColor.class)
- public JAXBElement<CTGammaTransform> createCTPresetColorGamma(CTGammaTransform value) {
- return new JAXBElement<>(_CTScRgbColorGamma_QNAME, CTGammaTransform.class, CTPresetColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTPresetColor.class)
- public JAXBElement<CTComplementTransform> createCTPresetColorComp(CTComplementTransform value) {
- return new JAXBElement<>(_CTScRgbColorComp_QNAME, CTComplementTransform.class, CTPresetColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTPresetColor.class)
- public JAXBElement<CTPercentage> createCTPresetColorSatOff(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorSatOff_QNAME, CTPercentage.class, CTPresetColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTPresetColor.class)
- public JAXBElement<CTPercentage> createCTPresetColorGreen(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorGreen_QNAME, CTPercentage.class, CTPresetColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTPresetColor.class)
- public JAXBElement<CTPercentage> createCTPresetColorLumOff(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorLumOff_QNAME, CTPercentage.class, CTPresetColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTPresetColor.class)
- public JAXBElement<CTPercentage> createCTPresetColorSat(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorSat_QNAME, CTPercentage.class, CTPresetColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTPresetColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTPresetColorShade(CTPositiveFixedPercentage value) {
- return new JAXBElement<>(_CTScRgbColorShade_QNAME, CTPositiveFixedPercentage.class, CTPresetColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTPresetColor.class)
- public JAXBElement<CTPercentage> createCTPresetColorRed(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorRed_QNAME, CTPercentage.class, CTPresetColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTPresetColor.class)
- public JAXBElement<CTGrayscaleTransform> createCTPresetColorGray(CTGrayscaleTransform value) {
- return new JAXBElement<>(_CTScRgbColorGray_QNAME, CTGrayscaleTransform.class, CTPresetColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTPresetColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTPresetColorAlpha(CTPositiveFixedPercentage value) {
- return new JAXBElement<>(_CTScRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTPresetColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTPresetColor.class)
- public JAXBElement<CTPercentage> createCTPresetColorGreenOff(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorGreenOff_QNAME, CTPercentage.class, CTPresetColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTPresetColor.class)
- public JAXBElement<CTPercentage> createCTPresetColorRedOff(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorRedOff_QNAME, CTPercentage.class, CTPresetColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTPresetColor.class)
- public JAXBElement<CTAngle> createCTPresetColorHueOff(CTAngle value) {
- return new JAXBElement<>(_CTScRgbColorHueOff_QNAME, CTAngle.class, CTPresetColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTPresetColor.class)
- public JAXBElement<CTPercentage> createCTPresetColorLum(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorLum_QNAME, CTPercentage.class, CTPresetColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTPresetColor.class)
- public JAXBElement<CTPercentage> createCTPresetColorBlueMod(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorBlueMod_QNAME, CTPercentage.class, CTPresetColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTPresetColor.class)
- public JAXBElement<CTPercentage> createCTPresetColorGreenMod(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorGreenMod_QNAME, CTPercentage.class, CTPresetColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTPresetColor.class)
- public JAXBElement<CTFixedPercentage> createCTPresetColorAlphaOff(CTFixedPercentage value) {
- return new JAXBElement<>(_CTScRgbColorAlphaOff_QNAME, CTFixedPercentage.class, CTPresetColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTPresetColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTPresetColorTint(CTPositiveFixedPercentage value) {
- return new JAXBElement<>(_CTScRgbColorTint_QNAME, CTPositiveFixedPercentage.class, CTPresetColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTPresetColor.class)
- public JAXBElement<CTInverseGammaTransform> createCTPresetColorInvGamma(CTInverseGammaTransform value) {
- return new JAXBElement<>(_CTScRgbColorInvGamma_QNAME, CTInverseGammaTransform.class, CTPresetColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTSchemeColor.class)
- public JAXBElement<CTInverseTransform> createCTSchemeColorInv(CTInverseTransform value) {
- return new JAXBElement<>(_CTScRgbColorInv_QNAME, CTInverseTransform.class, CTSchemeColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTSchemeColor.class)
- public JAXBElement<CTPercentage> createCTSchemeColorLumMod(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorLumMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTSchemeColor.class)
- public JAXBElement<CTPercentage> createCTSchemeColorBlue(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorBlue_QNAME, CTPercentage.class, CTSchemeColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTSchemeColor.class)
- public JAXBElement<CTPercentage> createCTSchemeColorRedMod(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorRedMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTSchemeColor.class)
- public JAXBElement<CTPercentage> createCTSchemeColorSatMod(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorSatMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTSchemeColor.class)
- public JAXBElement<CTPositiveFixedAngle> createCTSchemeColorHue(CTPositiveFixedAngle value) {
- return new JAXBElement<>(_CTScRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTSchemeColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTSchemeColor.class)
- public JAXBElement<CTPercentage> createCTSchemeColorBlueOff(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorBlueOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTSchemeColor.class)
- public JAXBElement<CTPositivePercentage> createCTSchemeColorHueMod(CTPositivePercentage value) {
- return new JAXBElement<>(_CTScRgbColorHueMod_QNAME, CTPositivePercentage.class, CTSchemeColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTSchemeColor.class)
- public JAXBElement<CTPositivePercentage> createCTSchemeColorAlphaMod(CTPositivePercentage value) {
- return new JAXBElement<>(_CTScRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTSchemeColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTSchemeColor.class)
- public JAXBElement<CTGammaTransform> createCTSchemeColorGamma(CTGammaTransform value) {
- return new JAXBElement<>(_CTScRgbColorGamma_QNAME, CTGammaTransform.class, CTSchemeColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTSchemeColor.class)
- public JAXBElement<CTComplementTransform> createCTSchemeColorComp(CTComplementTransform value) {
- return new JAXBElement<>(_CTScRgbColorComp_QNAME, CTComplementTransform.class, CTSchemeColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTSchemeColor.class)
- public JAXBElement<CTPercentage> createCTSchemeColorSatOff(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorSatOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTSchemeColor.class)
- public JAXBElement<CTPercentage> createCTSchemeColorGreen(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorGreen_QNAME, CTPercentage.class, CTSchemeColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTSchemeColor.class)
- public JAXBElement<CTPercentage> createCTSchemeColorLumOff(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorLumOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTSchemeColor.class)
- public JAXBElement<CTPercentage> createCTSchemeColorSat(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorSat_QNAME, CTPercentage.class, CTSchemeColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTSchemeColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTSchemeColorShade(CTPositiveFixedPercentage value) {
- return new JAXBElement<>(_CTScRgbColorShade_QNAME, CTPositiveFixedPercentage.class, CTSchemeColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTSchemeColor.class)
- public JAXBElement<CTPercentage> createCTSchemeColorRed(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorRed_QNAME, CTPercentage.class, CTSchemeColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTSchemeColor.class)
- public JAXBElement<CTGrayscaleTransform> createCTSchemeColorGray(CTGrayscaleTransform value) {
- return new JAXBElement<>(_CTScRgbColorGray_QNAME, CTGrayscaleTransform.class, CTSchemeColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTSchemeColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTSchemeColorAlpha(CTPositiveFixedPercentage value) {
- return new JAXBElement<>(_CTScRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTSchemeColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTSchemeColor.class)
- public JAXBElement<CTPercentage> createCTSchemeColorGreenOff(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorGreenOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTSchemeColor.class)
- public JAXBElement<CTPercentage> createCTSchemeColorRedOff(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorRedOff_QNAME, CTPercentage.class, CTSchemeColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTSchemeColor.class)
- public JAXBElement<CTAngle> createCTSchemeColorHueOff(CTAngle value) {
- return new JAXBElement<>(_CTScRgbColorHueOff_QNAME, CTAngle.class, CTSchemeColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTSchemeColor.class)
- public JAXBElement<CTPercentage> createCTSchemeColorLum(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorLum_QNAME, CTPercentage.class, CTSchemeColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTSchemeColor.class)
- public JAXBElement<CTPercentage> createCTSchemeColorBlueMod(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorBlueMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTSchemeColor.class)
- public JAXBElement<CTPercentage> createCTSchemeColorGreenMod(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorGreenMod_QNAME, CTPercentage.class, CTSchemeColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTSchemeColor.class)
- public JAXBElement<CTFixedPercentage> createCTSchemeColorAlphaOff(CTFixedPercentage value) {
- return new JAXBElement<>(_CTScRgbColorAlphaOff_QNAME, CTFixedPercentage.class, CTSchemeColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTSchemeColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTSchemeColorTint(CTPositiveFixedPercentage value) {
- return new JAXBElement<>(_CTScRgbColorTint_QNAME, CTPositiveFixedPercentage.class, CTSchemeColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTSchemeColor.class)
- public JAXBElement<CTInverseGammaTransform> createCTSchemeColorInvGamma(CTInverseGammaTransform value) {
- return new JAXBElement<>(_CTScRgbColorInvGamma_QNAME, CTInverseGammaTransform.class, CTSchemeColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTSystemColor.class)
- public JAXBElement<CTInverseTransform> createCTSystemColorInv(CTInverseTransform value) {
- return new JAXBElement<>(_CTScRgbColorInv_QNAME, CTInverseTransform.class, CTSystemColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTSystemColor.class)
- public JAXBElement<CTPercentage> createCTSystemColorLumMod(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorLumMod_QNAME, CTPercentage.class, CTSystemColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTSystemColor.class)
- public JAXBElement<CTPercentage> createCTSystemColorBlue(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorBlue_QNAME, CTPercentage.class, CTSystemColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTSystemColor.class)
- public JAXBElement<CTPercentage> createCTSystemColorRedMod(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorRedMod_QNAME, CTPercentage.class, CTSystemColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTSystemColor.class)
- public JAXBElement<CTPercentage> createCTSystemColorSatMod(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorSatMod_QNAME, CTPercentage.class, CTSystemColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTSystemColor.class)
- public JAXBElement<CTPositiveFixedAngle> createCTSystemColorHue(CTPositiveFixedAngle value) {
- return new JAXBElement<>(_CTScRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTSystemColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTSystemColor.class)
- public JAXBElement<CTPercentage> createCTSystemColorBlueOff(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorBlueOff_QNAME, CTPercentage.class, CTSystemColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTSystemColor.class)
- public JAXBElement<CTPositivePercentage> createCTSystemColorHueMod(CTPositivePercentage value) {
- return new JAXBElement<>(_CTScRgbColorHueMod_QNAME, CTPositivePercentage.class, CTSystemColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTSystemColor.class)
- public JAXBElement<CTPositivePercentage> createCTSystemColorAlphaMod(CTPositivePercentage value) {
- return new JAXBElement<>(_CTScRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTSystemColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTSystemColor.class)
- public JAXBElement<CTGammaTransform> createCTSystemColorGamma(CTGammaTransform value) {
- return new JAXBElement<>(_CTScRgbColorGamma_QNAME, CTGammaTransform.class, CTSystemColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTSystemColor.class)
- public JAXBElement<CTComplementTransform> createCTSystemColorComp(CTComplementTransform value) {
- return new JAXBElement<>(_CTScRgbColorComp_QNAME, CTComplementTransform.class, CTSystemColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTSystemColor.class)
- public JAXBElement<CTPercentage> createCTSystemColorSatOff(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorSatOff_QNAME, CTPercentage.class, CTSystemColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTSystemColor.class)
- public JAXBElement<CTPercentage> createCTSystemColorGreen(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorGreen_QNAME, CTPercentage.class, CTSystemColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTSystemColor.class)
- public JAXBElement<CTPercentage> createCTSystemColorLumOff(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorLumOff_QNAME, CTPercentage.class, CTSystemColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTSystemColor.class)
- public JAXBElement<CTPercentage> createCTSystemColorSat(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorSat_QNAME, CTPercentage.class, CTSystemColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTSystemColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTSystemColorShade(CTPositiveFixedPercentage value) {
- return new JAXBElement<>(_CTScRgbColorShade_QNAME, CTPositiveFixedPercentage.class, CTSystemColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTSystemColor.class)
- public JAXBElement<CTPercentage> createCTSystemColorRed(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorRed_QNAME, CTPercentage.class, CTSystemColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTSystemColor.class)
- public JAXBElement<CTGrayscaleTransform> createCTSystemColorGray(CTGrayscaleTransform value) {
- return new JAXBElement<>(_CTScRgbColorGray_QNAME, CTGrayscaleTransform.class, CTSystemColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTSystemColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTSystemColorAlpha(CTPositiveFixedPercentage value) {
- return new JAXBElement<>(_CTScRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTSystemColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTSystemColor.class)
- public JAXBElement<CTPercentage> createCTSystemColorGreenOff(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorGreenOff_QNAME, CTPercentage.class, CTSystemColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTSystemColor.class)
- public JAXBElement<CTPercentage> createCTSystemColorRedOff(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorRedOff_QNAME, CTPercentage.class, CTSystemColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTSystemColor.class)
- public JAXBElement<CTAngle> createCTSystemColorHueOff(CTAngle value) {
- return new JAXBElement<>(_CTScRgbColorHueOff_QNAME, CTAngle.class, CTSystemColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTSystemColor.class)
- public JAXBElement<CTPercentage> createCTSystemColorLum(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorLum_QNAME, CTPercentage.class, CTSystemColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTSystemColor.class)
- public JAXBElement<CTPercentage> createCTSystemColorBlueMod(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorBlueMod_QNAME, CTPercentage.class, CTSystemColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTSystemColor.class)
- public JAXBElement<CTPercentage> createCTSystemColorGreenMod(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorGreenMod_QNAME, CTPercentage.class, CTSystemColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTSystemColor.class)
- public JAXBElement<CTFixedPercentage> createCTSystemColorAlphaOff(CTFixedPercentage value) {
- return new JAXBElement<>(_CTScRgbColorAlphaOff_QNAME, CTFixedPercentage.class, CTSystemColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTSystemColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTSystemColorTint(CTPositiveFixedPercentage value) {
- return new JAXBElement<>(_CTScRgbColorTint_QNAME, CTPositiveFixedPercentage.class, CTSystemColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTSystemColor.class)
- public JAXBElement<CTInverseGammaTransform> createCTSystemColorInvGamma(CTInverseGammaTransform value) {
- return new JAXBElement<>(_CTScRgbColorInvGamma_QNAME, CTInverseGammaTransform.class, CTSystemColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTSRgbColor.class)
- public JAXBElement<CTInverseTransform> createCTSRgbColorInv(CTInverseTransform value) {
- return new JAXBElement<>(_CTScRgbColorInv_QNAME, CTInverseTransform.class, CTSRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTSRgbColor.class)
- public JAXBElement<CTPercentage> createCTSRgbColorLumMod(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorLumMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTSRgbColor.class)
- public JAXBElement<CTPercentage> createCTSRgbColorBlue(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorBlue_QNAME, CTPercentage.class, CTSRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTSRgbColor.class)
- public JAXBElement<CTPercentage> createCTSRgbColorRedMod(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorRedMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTSRgbColor.class)
- public JAXBElement<CTPercentage> createCTSRgbColorSatMod(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorSatMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTSRgbColor.class)
- public JAXBElement<CTPositiveFixedAngle> createCTSRgbColorHue(CTPositiveFixedAngle value) {
- return new JAXBElement<>(_CTScRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTSRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTSRgbColor.class)
- public JAXBElement<CTPercentage> createCTSRgbColorBlueOff(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorBlueOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTSRgbColor.class)
- public JAXBElement<CTPositivePercentage> createCTSRgbColorHueMod(CTPositivePercentage value) {
- return new JAXBElement<>(_CTScRgbColorHueMod_QNAME, CTPositivePercentage.class, CTSRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTSRgbColor.class)
- public JAXBElement<CTPositivePercentage> createCTSRgbColorAlphaMod(CTPositivePercentage value) {
- return new JAXBElement<>(_CTScRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTSRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTSRgbColor.class)
- public JAXBElement<CTGammaTransform> createCTSRgbColorGamma(CTGammaTransform value) {
- return new JAXBElement<>(_CTScRgbColorGamma_QNAME, CTGammaTransform.class, CTSRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTSRgbColor.class)
- public JAXBElement<CTComplementTransform> createCTSRgbColorComp(CTComplementTransform value) {
- return new JAXBElement<>(_CTScRgbColorComp_QNAME, CTComplementTransform.class, CTSRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTSRgbColor.class)
- public JAXBElement<CTPercentage> createCTSRgbColorSatOff(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorSatOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTSRgbColor.class)
- public JAXBElement<CTPercentage> createCTSRgbColorGreen(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorGreen_QNAME, CTPercentage.class, CTSRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTSRgbColor.class)
- public JAXBElement<CTPercentage> createCTSRgbColorLumOff(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorLumOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTSRgbColor.class)
- public JAXBElement<CTPercentage> createCTSRgbColorSat(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorSat_QNAME, CTPercentage.class, CTSRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTSRgbColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTSRgbColorShade(CTPositiveFixedPercentage value) {
- return new JAXBElement<>(_CTScRgbColorShade_QNAME, CTPositiveFixedPercentage.class, CTSRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTSRgbColor.class)
- public JAXBElement<CTPercentage> createCTSRgbColorRed(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorRed_QNAME, CTPercentage.class, CTSRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTSRgbColor.class)
- public JAXBElement<CTGrayscaleTransform> createCTSRgbColorGray(CTGrayscaleTransform value) {
- return new JAXBElement<>(_CTScRgbColorGray_QNAME, CTGrayscaleTransform.class, CTSRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTSRgbColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTSRgbColorAlpha(CTPositiveFixedPercentage value) {
- return new JAXBElement<>(_CTScRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTSRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTSRgbColor.class)
- public JAXBElement<CTPercentage> createCTSRgbColorGreenOff(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorGreenOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTSRgbColor.class)
- public JAXBElement<CTPercentage> createCTSRgbColorRedOff(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorRedOff_QNAME, CTPercentage.class, CTSRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTSRgbColor.class)
- public JAXBElement<CTAngle> createCTSRgbColorHueOff(CTAngle value) {
- return new JAXBElement<>(_CTScRgbColorHueOff_QNAME, CTAngle.class, CTSRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTSRgbColor.class)
- public JAXBElement<CTPercentage> createCTSRgbColorLum(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorLum_QNAME, CTPercentage.class, CTSRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTSRgbColor.class)
- public JAXBElement<CTPercentage> createCTSRgbColorBlueMod(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorBlueMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTSRgbColor.class)
- public JAXBElement<CTPercentage> createCTSRgbColorGreenMod(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorGreenMod_QNAME, CTPercentage.class, CTSRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTSRgbColor.class)
- public JAXBElement<CTFixedPercentage> createCTSRgbColorAlphaOff(CTFixedPercentage value) {
- return new JAXBElement<>(_CTScRgbColorAlphaOff_QNAME, CTFixedPercentage.class, CTSRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTSRgbColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTSRgbColorTint(CTPositiveFixedPercentage value) {
- return new JAXBElement<>(_CTScRgbColorTint_QNAME, CTPositiveFixedPercentage.class, CTSRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTSRgbColor.class)
- public JAXBElement<CTInverseGammaTransform> createCTSRgbColorInvGamma(CTInverseGammaTransform value) {
- return new JAXBElement<>(_CTScRgbColorInvGamma_QNAME, CTInverseGammaTransform.class, CTSRgbColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "inv", scope = CTHslColor.class)
- public JAXBElement<CTInverseTransform> createCTHslColorInv(CTInverseTransform value) {
- return new JAXBElement<>(_CTScRgbColorInv_QNAME, CTInverseTransform.class, CTHslColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumMod", scope = CTHslColor.class)
- public JAXBElement<CTPercentage> createCTHslColorLumMod(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorLumMod_QNAME, CTPercentage.class, CTHslColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blue", scope = CTHslColor.class)
- public JAXBElement<CTPercentage> createCTHslColorBlue(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorBlue_QNAME, CTPercentage.class, CTHslColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redMod", scope = CTHslColor.class)
- public JAXBElement<CTPercentage> createCTHslColorRedMod(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorRedMod_QNAME, CTPercentage.class, CTHslColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satMod", scope = CTHslColor.class)
- public JAXBElement<CTPercentage> createCTHslColorSatMod(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorSatMod_QNAME, CTPercentage.class, CTHslColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hue", scope = CTHslColor.class)
- public JAXBElement<CTPositiveFixedAngle> createCTHslColorHue(CTPositiveFixedAngle value) {
- return new JAXBElement<>(_CTScRgbColorHue_QNAME, CTPositiveFixedAngle.class, CTHslColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueOff", scope = CTHslColor.class)
- public JAXBElement<CTPercentage> createCTHslColorBlueOff(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorBlueOff_QNAME, CTPercentage.class, CTHslColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueMod", scope = CTHslColor.class)
- public JAXBElement<CTPositivePercentage> createCTHslColorHueMod(CTPositivePercentage value) {
- return new JAXBElement<>(_CTScRgbColorHueMod_QNAME, CTPositivePercentage.class, CTHslColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaMod", scope = CTHslColor.class)
- public JAXBElement<CTPositivePercentage> createCTHslColorAlphaMod(CTPositivePercentage value) {
- return new JAXBElement<>(_CTScRgbColorAlphaMod_QNAME, CTPositivePercentage.class, CTHslColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gamma", scope = CTHslColor.class)
- public JAXBElement<CTGammaTransform> createCTHslColorGamma(CTGammaTransform value) {
- return new JAXBElement<>(_CTScRgbColorGamma_QNAME, CTGammaTransform.class, CTHslColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "comp", scope = CTHslColor.class)
- public JAXBElement<CTComplementTransform> createCTHslColorComp(CTComplementTransform value) {
- return new JAXBElement<>(_CTScRgbColorComp_QNAME, CTComplementTransform.class, CTHslColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "satOff", scope = CTHslColor.class)
- public JAXBElement<CTPercentage> createCTHslColorSatOff(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorSatOff_QNAME, CTPercentage.class, CTHslColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "green", scope = CTHslColor.class)
- public JAXBElement<CTPercentage> createCTHslColorGreen(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorGreen_QNAME, CTPercentage.class, CTHslColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lumOff", scope = CTHslColor.class)
- public JAXBElement<CTPercentage> createCTHslColorLumOff(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorLumOff_QNAME, CTPercentage.class, CTHslColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "sat", scope = CTHslColor.class)
- public JAXBElement<CTPercentage> createCTHslColorSat(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorSat_QNAME, CTPercentage.class, CTHslColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "shade", scope = CTHslColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTHslColorShade(CTPositiveFixedPercentage value) {
- return new JAXBElement<>(_CTScRgbColorShade_QNAME, CTPositiveFixedPercentage.class, CTHslColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "red", scope = CTHslColor.class)
- public JAXBElement<CTPercentage> createCTHslColorRed(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorRed_QNAME, CTPercentage.class, CTHslColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "gray", scope = CTHslColor.class)
- public JAXBElement<CTGrayscaleTransform> createCTHslColorGray(CTGrayscaleTransform value) {
- return new JAXBElement<>(_CTScRgbColorGray_QNAME, CTGrayscaleTransform.class, CTHslColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alpha", scope = CTHslColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTHslColorAlpha(CTPositiveFixedPercentage value) {
- return new JAXBElement<>(_CTScRgbColorAlpha_QNAME, CTPositiveFixedPercentage.class, CTHslColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenOff", scope = CTHslColor.class)
- public JAXBElement<CTPercentage> createCTHslColorGreenOff(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorGreenOff_QNAME, CTPercentage.class, CTHslColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "redOff", scope = CTHslColor.class)
- public JAXBElement<CTPercentage> createCTHslColorRedOff(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorRedOff_QNAME, CTPercentage.class, CTHslColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTAngle }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "hueOff", scope = CTHslColor.class)
- public JAXBElement<CTAngle> createCTHslColorHueOff(CTAngle value) {
- return new JAXBElement<>(_CTScRgbColorHueOff_QNAME, CTAngle.class, CTHslColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "lum", scope = CTHslColor.class)
- public JAXBElement<CTPercentage> createCTHslColorLum(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorLum_QNAME, CTPercentage.class, CTHslColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "blueMod", scope = CTHslColor.class)
- public JAXBElement<CTPercentage> createCTHslColorBlueMod(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorBlueMod_QNAME, CTPercentage.class, CTHslColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "greenMod", scope = CTHslColor.class)
- public JAXBElement<CTPercentage> createCTHslColorGreenMod(CTPercentage value) {
- return new JAXBElement<>(_CTScRgbColorGreenMod_QNAME, CTPercentage.class, CTHslColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "alphaOff", scope = CTHslColor.class)
- public JAXBElement<CTFixedPercentage> createCTHslColorAlphaOff(CTFixedPercentage value) {
- return new JAXBElement<>(_CTScRgbColorAlphaOff_QNAME, CTFixedPercentage.class, CTHslColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "tint", scope = CTHslColor.class)
- public JAXBElement<CTPositiveFixedPercentage> createCTHslColorTint(CTPositiveFixedPercentage value) {
- return new JAXBElement<>(_CTScRgbColorTint_QNAME, CTPositiveFixedPercentage.class, CTHslColor.class, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", name = "invGamma", scope = CTHslColor.class)
- public JAXBElement<CTInverseGammaTransform> createCTHslColorInvGamma(CTInverseGammaTransform value) {
- return new JAXBElement<>(_CTScRgbColorInvGamma_QNAME, CTInverseGammaTransform.class, CTHslColor.class, value);
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/STBlackWhiteMode.java b/src/java/org/apache/poi/sl/draw/binding/STBlackWhiteMode.java
deleted file mode 100644
index e7e10f4071..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/STBlackWhiteMode.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for ST_BlackWhiteMode.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="ST_BlackWhiteMode"&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token"&gt;
- * &lt;enumeration value="clr"/&gt;
- * &lt;enumeration value="auto"/&gt;
- * &lt;enumeration value="gray"/&gt;
- * &lt;enumeration value="ltGray"/&gt;
- * &lt;enumeration value="invGray"/&gt;
- * &lt;enumeration value="grayWhite"/&gt;
- * &lt;enumeration value="blackGray"/&gt;
- * &lt;enumeration value="blackWhite"/&gt;
- * &lt;enumeration value="black"/&gt;
- * &lt;enumeration value="white"/&gt;
- * &lt;enumeration value="hidden"/&gt;
- * &lt;/restriction&gt;
- * &lt;/simpleType&gt;
- * </pre>
- *
- */
-@XmlType(name = "ST_BlackWhiteMode")
-@XmlEnum
-public enum STBlackWhiteMode {
-
-
- /**
- * Color
- *
- */
- @XmlEnumValue("clr")
- CLR("clr"),
-
- /**
- * Automatic
- *
- */
- @XmlEnumValue("auto")
- AUTO("auto"),
-
- /**
- * Gray
- *
- */
- @XmlEnumValue("gray")
- GRAY("gray"),
-
- /**
- * Light Gray
- *
- */
- @XmlEnumValue("ltGray")
- LT_GRAY("ltGray"),
-
- /**
- * Inverse Gray
- *
- */
- @XmlEnumValue("invGray")
- INV_GRAY("invGray"),
-
- /**
- * Gray and White
- *
- */
- @XmlEnumValue("grayWhite")
- GRAY_WHITE("grayWhite"),
-
- /**
- * Black and Gray
- *
- */
- @XmlEnumValue("blackGray")
- BLACK_GRAY("blackGray"),
-
- /**
- * Black and White
- *
- */
- @XmlEnumValue("blackWhite")
- BLACK_WHITE("blackWhite"),
-
- /**
- * Black
- *
- */
- @XmlEnumValue("black")
- BLACK("black"),
-
- /**
- * White
- *
- */
- @XmlEnumValue("white")
- WHITE("white"),
-
- /**
- * Hidden
- *
- */
- @XmlEnumValue("hidden")
- HIDDEN("hidden");
- private final String value;
-
- STBlackWhiteMode(String v) {
- value = v;
- }
-
- public String value() {
- return value;
- }
-
- public static STBlackWhiteMode fromValue(String v) {
- for (STBlackWhiteMode c: STBlackWhiteMode.values()) {
- if (c.value.equals(v)) {
- return c;
- }
- }
- throw new IllegalArgumentException(v);
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/STPathFillMode.java b/src/java/org/apache/poi/sl/draw/binding/STPathFillMode.java
deleted file mode 100644
index 820ca5c790..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/STPathFillMode.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for ST_PathFillMode.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="ST_PathFillMode"&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token"&gt;
- * &lt;enumeration value="none"/&gt;
- * &lt;enumeration value="norm"/&gt;
- * &lt;enumeration value="lighten"/&gt;
- * &lt;enumeration value="lightenLess"/&gt;
- * &lt;enumeration value="darken"/&gt;
- * &lt;enumeration value="darkenLess"/&gt;
- * &lt;/restriction&gt;
- * &lt;/simpleType&gt;
- * </pre>
- *
- */
-@XmlType(name = "ST_PathFillMode")
-@XmlEnum
-public enum STPathFillMode {
-
-
- /**
- * No Path Fill
- *
- */
- @XmlEnumValue("none")
- NONE("none"),
-
- /**
- * Normal Path Fill
- *
- */
- @XmlEnumValue("norm")
- NORM("norm"),
-
- /**
- * Lighten Path Fill
- *
- */
- @XmlEnumValue("lighten")
- LIGHTEN("lighten"),
-
- /**
- * Lighten Path Fill Less
- *
- */
- @XmlEnumValue("lightenLess")
- LIGHTEN_LESS("lightenLess"),
-
- /**
- * Darken Path Fill
- *
- */
- @XmlEnumValue("darken")
- DARKEN("darken"),
-
- /**
- * Darken Path Fill Less
- *
- */
- @XmlEnumValue("darkenLess")
- DARKEN_LESS("darkenLess");
- private final String value;
-
- STPathFillMode(String v) {
- value = v;
- }
-
- public String value() {
- return value;
- }
-
- public static STPathFillMode fromValue(String v) {
- for (STPathFillMode c: STPathFillMode.values()) {
- if (c.value.equals(v)) {
- return c;
- }
- }
- throw new IllegalArgumentException(v);
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/STPresetColorVal.java b/src/java/org/apache/poi/sl/draw/binding/STPresetColorVal.java
deleted file mode 100644
index d011d233d3..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/STPresetColorVal.java
+++ /dev/null
@@ -1,1181 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for ST_PresetColorVal.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="ST_PresetColorVal"&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token"&gt;
- * &lt;enumeration value="aliceBlue"/&gt;
- * &lt;enumeration value="antiqueWhite"/&gt;
- * &lt;enumeration value="aqua"/&gt;
- * &lt;enumeration value="aquamarine"/&gt;
- * &lt;enumeration value="azure"/&gt;
- * &lt;enumeration value="beige"/&gt;
- * &lt;enumeration value="bisque"/&gt;
- * &lt;enumeration value="black"/&gt;
- * &lt;enumeration value="blanchedAlmond"/&gt;
- * &lt;enumeration value="blue"/&gt;
- * &lt;enumeration value="blueViolet"/&gt;
- * &lt;enumeration value="brown"/&gt;
- * &lt;enumeration value="burlyWood"/&gt;
- * &lt;enumeration value="cadetBlue"/&gt;
- * &lt;enumeration value="chartreuse"/&gt;
- * &lt;enumeration value="chocolate"/&gt;
- * &lt;enumeration value="coral"/&gt;
- * &lt;enumeration value="cornflowerBlue"/&gt;
- * &lt;enumeration value="cornsilk"/&gt;
- * &lt;enumeration value="crimson"/&gt;
- * &lt;enumeration value="cyan"/&gt;
- * &lt;enumeration value="dkBlue"/&gt;
- * &lt;enumeration value="dkCyan"/&gt;
- * &lt;enumeration value="dkGoldenrod"/&gt;
- * &lt;enumeration value="dkGray"/&gt;
- * &lt;enumeration value="dkGreen"/&gt;
- * &lt;enumeration value="dkKhaki"/&gt;
- * &lt;enumeration value="dkMagenta"/&gt;
- * &lt;enumeration value="dkOliveGreen"/&gt;
- * &lt;enumeration value="dkOrange"/&gt;
- * &lt;enumeration value="dkOrchid"/&gt;
- * &lt;enumeration value="dkRed"/&gt;
- * &lt;enumeration value="dkSalmon"/&gt;
- * &lt;enumeration value="dkSeaGreen"/&gt;
- * &lt;enumeration value="dkSlateBlue"/&gt;
- * &lt;enumeration value="dkSlateGray"/&gt;
- * &lt;enumeration value="dkTurquoise"/&gt;
- * &lt;enumeration value="dkViolet"/&gt;
- * &lt;enumeration value="deepPink"/&gt;
- * &lt;enumeration value="deepSkyBlue"/&gt;
- * &lt;enumeration value="dimGray"/&gt;
- * &lt;enumeration value="dodgerBlue"/&gt;
- * &lt;enumeration value="firebrick"/&gt;
- * &lt;enumeration value="floralWhite"/&gt;
- * &lt;enumeration value="forestGreen"/&gt;
- * &lt;enumeration value="fuchsia"/&gt;
- * &lt;enumeration value="gainsboro"/&gt;
- * &lt;enumeration value="ghostWhite"/&gt;
- * &lt;enumeration value="gold"/&gt;
- * &lt;enumeration value="goldenrod"/&gt;
- * &lt;enumeration value="gray"/&gt;
- * &lt;enumeration value="green"/&gt;
- * &lt;enumeration value="greenYellow"/&gt;
- * &lt;enumeration value="honeydew"/&gt;
- * &lt;enumeration value="hotPink"/&gt;
- * &lt;enumeration value="indianRed"/&gt;
- * &lt;enumeration value="indigo"/&gt;
- * &lt;enumeration value="ivory"/&gt;
- * &lt;enumeration value="khaki"/&gt;
- * &lt;enumeration value="lavender"/&gt;
- * &lt;enumeration value="lavenderBlush"/&gt;
- * &lt;enumeration value="lawnGreen"/&gt;
- * &lt;enumeration value="lemonChiffon"/&gt;
- * &lt;enumeration value="ltBlue"/&gt;
- * &lt;enumeration value="ltCoral"/&gt;
- * &lt;enumeration value="ltCyan"/&gt;
- * &lt;enumeration value="ltGoldenrodYellow"/&gt;
- * &lt;enumeration value="ltGray"/&gt;
- * &lt;enumeration value="ltGreen"/&gt;
- * &lt;enumeration value="ltPink"/&gt;
- * &lt;enumeration value="ltSalmon"/&gt;
- * &lt;enumeration value="ltSeaGreen"/&gt;
- * &lt;enumeration value="ltSkyBlue"/&gt;
- * &lt;enumeration value="ltSlateGray"/&gt;
- * &lt;enumeration value="ltSteelBlue"/&gt;
- * &lt;enumeration value="ltYellow"/&gt;
- * &lt;enumeration value="lime"/&gt;
- * &lt;enumeration value="limeGreen"/&gt;
- * &lt;enumeration value="linen"/&gt;
- * &lt;enumeration value="magenta"/&gt;
- * &lt;enumeration value="maroon"/&gt;
- * &lt;enumeration value="medAquamarine"/&gt;
- * &lt;enumeration value="medBlue"/&gt;
- * &lt;enumeration value="medOrchid"/&gt;
- * &lt;enumeration value="medPurple"/&gt;
- * &lt;enumeration value="medSeaGreen"/&gt;
- * &lt;enumeration value="medSlateBlue"/&gt;
- * &lt;enumeration value="medSpringGreen"/&gt;
- * &lt;enumeration value="medTurquoise"/&gt;
- * &lt;enumeration value="medVioletRed"/&gt;
- * &lt;enumeration value="midnightBlue"/&gt;
- * &lt;enumeration value="mintCream"/&gt;
- * &lt;enumeration value="mistyRose"/&gt;
- * &lt;enumeration value="moccasin"/&gt;
- * &lt;enumeration value="navajoWhite"/&gt;
- * &lt;enumeration value="navy"/&gt;
- * &lt;enumeration value="oldLace"/&gt;
- * &lt;enumeration value="olive"/&gt;
- * &lt;enumeration value="oliveDrab"/&gt;
- * &lt;enumeration value="orange"/&gt;
- * &lt;enumeration value="orangeRed"/&gt;
- * &lt;enumeration value="orchid"/&gt;
- * &lt;enumeration value="paleGoldenrod"/&gt;
- * &lt;enumeration value="paleGreen"/&gt;
- * &lt;enumeration value="paleTurquoise"/&gt;
- * &lt;enumeration value="paleVioletRed"/&gt;
- * &lt;enumeration value="papayaWhip"/&gt;
- * &lt;enumeration value="peachPuff"/&gt;
- * &lt;enumeration value="peru"/&gt;
- * &lt;enumeration value="pink"/&gt;
- * &lt;enumeration value="plum"/&gt;
- * &lt;enumeration value="powderBlue"/&gt;
- * &lt;enumeration value="purple"/&gt;
- * &lt;enumeration value="red"/&gt;
- * &lt;enumeration value="rosyBrown"/&gt;
- * &lt;enumeration value="royalBlue"/&gt;
- * &lt;enumeration value="saddleBrown"/&gt;
- * &lt;enumeration value="salmon"/&gt;
- * &lt;enumeration value="sandyBrown"/&gt;
- * &lt;enumeration value="seaGreen"/&gt;
- * &lt;enumeration value="seaShell"/&gt;
- * &lt;enumeration value="sienna"/&gt;
- * &lt;enumeration value="silver"/&gt;
- * &lt;enumeration value="skyBlue"/&gt;
- * &lt;enumeration value="slateBlue"/&gt;
- * &lt;enumeration value="slateGray"/&gt;
- * &lt;enumeration value="snow"/&gt;
- * &lt;enumeration value="springGreen"/&gt;
- * &lt;enumeration value="steelBlue"/&gt;
- * &lt;enumeration value="tan"/&gt;
- * &lt;enumeration value="teal"/&gt;
- * &lt;enumeration value="thistle"/&gt;
- * &lt;enumeration value="tomato"/&gt;
- * &lt;enumeration value="turquoise"/&gt;
- * &lt;enumeration value="violet"/&gt;
- * &lt;enumeration value="wheat"/&gt;
- * &lt;enumeration value="white"/&gt;
- * &lt;enumeration value="whiteSmoke"/&gt;
- * &lt;enumeration value="yellow"/&gt;
- * &lt;enumeration value="yellowGreen"/&gt;
- * &lt;/restriction&gt;
- * &lt;/simpleType&gt;
- * </pre>
- *
- */
-@XmlType(name = "ST_PresetColorVal")
-@XmlEnum
-public enum STPresetColorVal {
-
-
- /**
- * Alice Blue Preset Color
- *
- */
- @XmlEnumValue("aliceBlue")
- ALICE_BLUE("aliceBlue"),
-
- /**
- * Antique White Preset Color
- *
- */
- @XmlEnumValue("antiqueWhite")
- ANTIQUE_WHITE("antiqueWhite"),
-
- /**
- * Aqua Preset Color
- *
- */
- @XmlEnumValue("aqua")
- AQUA("aqua"),
-
- /**
- * Aquamarine Preset Color
- *
- */
- @XmlEnumValue("aquamarine")
- AQUAMARINE("aquamarine"),
-
- /**
- * Azure Preset Color
- *
- */
- @XmlEnumValue("azure")
- AZURE("azure"),
-
- /**
- * Beige Preset Color
- *
- */
- @XmlEnumValue("beige")
- BEIGE("beige"),
-
- /**
- * Bisque Preset Color
- *
- */
- @XmlEnumValue("bisque")
- BISQUE("bisque"),
-
- /**
- * Black Preset Color
- *
- */
- @XmlEnumValue("black")
- BLACK("black"),
-
- /**
- * Blanched Almond Preset Color
- *
- */
- @XmlEnumValue("blanchedAlmond")
- BLANCHED_ALMOND("blanchedAlmond"),
-
- /**
- * Blue Preset Color
- *
- */
- @XmlEnumValue("blue")
- BLUE("blue"),
-
- /**
- * Blue Violet Preset Color
- *
- */
- @XmlEnumValue("blueViolet")
- BLUE_VIOLET("blueViolet"),
-
- /**
- * Brown Preset Color
- *
- */
- @XmlEnumValue("brown")
- BROWN("brown"),
-
- /**
- * Burly Wood Preset Color
- *
- */
- @XmlEnumValue("burlyWood")
- BURLY_WOOD("burlyWood"),
-
- /**
- * Cadet Blue Preset Color
- *
- */
- @XmlEnumValue("cadetBlue")
- CADET_BLUE("cadetBlue"),
-
- /**
- * Chartreuse Preset Color
- *
- */
- @XmlEnumValue("chartreuse")
- CHARTREUSE("chartreuse"),
-
- /**
- * Chocolate Preset Color
- *
- */
- @XmlEnumValue("chocolate")
- CHOCOLATE("chocolate"),
-
- /**
- * Coral Preset Color
- *
- */
- @XmlEnumValue("coral")
- CORAL("coral"),
-
- /**
- * Cornflower Blue Preset Color
- *
- */
- @XmlEnumValue("cornflowerBlue")
- CORNFLOWER_BLUE("cornflowerBlue"),
-
- /**
- * Cornsilk Preset Color
- *
- */
- @XmlEnumValue("cornsilk")
- CORNSILK("cornsilk"),
-
- /**
- * Crimson Preset Color
- *
- */
- @XmlEnumValue("crimson")
- CRIMSON("crimson"),
-
- /**
- * Cyan Preset Color
- *
- */
- @XmlEnumValue("cyan")
- CYAN("cyan"),
-
- /**
- * Dark Blue Preset Color
- *
- */
- @XmlEnumValue("dkBlue")
- DK_BLUE("dkBlue"),
-
- /**
- * Dark Cyan Preset Color
- *
- */
- @XmlEnumValue("dkCyan")
- DK_CYAN("dkCyan"),
-
- /**
- * Dark Goldenrod Preset Color
- *
- */
- @XmlEnumValue("dkGoldenrod")
- DK_GOLDENROD("dkGoldenrod"),
-
- /**
- * Dark Gray Preset Color
- *
- */
- @XmlEnumValue("dkGray")
- DK_GRAY("dkGray"),
-
- /**
- * Dark Green Preset Color
- *
- */
- @XmlEnumValue("dkGreen")
- DK_GREEN("dkGreen"),
-
- /**
- * Dark Khaki Preset Color
- *
- */
- @XmlEnumValue("dkKhaki")
- DK_KHAKI("dkKhaki"),
-
- /**
- * Dark Magenta Preset Color
- *
- */
- @XmlEnumValue("dkMagenta")
- DK_MAGENTA("dkMagenta"),
-
- /**
- * Dark Olive Green Preset Color
- *
- */
- @XmlEnumValue("dkOliveGreen")
- DK_OLIVE_GREEN("dkOliveGreen"),
-
- /**
- * Dark Orange Preset Color
- *
- */
- @XmlEnumValue("dkOrange")
- DK_ORANGE("dkOrange"),
-
- /**
- * Dark Orchid Preset Color
- *
- */
- @XmlEnumValue("dkOrchid")
- DK_ORCHID("dkOrchid"),
-
- /**
- * Dark Red Preset Color
- *
- */
- @XmlEnumValue("dkRed")
- DK_RED("dkRed"),
-
- /**
- * Dark Salmon Preset Color
- *
- */
- @XmlEnumValue("dkSalmon")
- DK_SALMON("dkSalmon"),
-
- /**
- * Dark Sea Green Preset Color
- *
- */
- @XmlEnumValue("dkSeaGreen")
- DK_SEA_GREEN("dkSeaGreen"),
-
- /**
- * Dark Slate Blue Preset Color
- *
- */
- @XmlEnumValue("dkSlateBlue")
- DK_SLATE_BLUE("dkSlateBlue"),
-
- /**
- * Dark Slate Gray Preset Color
- *
- */
- @XmlEnumValue("dkSlateGray")
- DK_SLATE_GRAY("dkSlateGray"),
-
- /**
- * Dark Turquoise Preset Color
- *
- */
- @XmlEnumValue("dkTurquoise")
- DK_TURQUOISE("dkTurquoise"),
-
- /**
- * Dark Violet Preset Color
- *
- */
- @XmlEnumValue("dkViolet")
- DK_VIOLET("dkViolet"),
-
- /**
- * Deep Pink Preset Color
- *
- */
- @XmlEnumValue("deepPink")
- DEEP_PINK("deepPink"),
-
- /**
- * Deep Sky Blue Preset Color
- *
- */
- @XmlEnumValue("deepSkyBlue")
- DEEP_SKY_BLUE("deepSkyBlue"),
-
- /**
- * Dim Gray Preset Color
- *
- */
- @XmlEnumValue("dimGray")
- DIM_GRAY("dimGray"),
-
- /**
- * Dodger Blue Preset Color
- *
- */
- @XmlEnumValue("dodgerBlue")
- DODGER_BLUE("dodgerBlue"),
-
- /**
- * Firebrick Preset Color
- *
- */
- @XmlEnumValue("firebrick")
- FIREBRICK("firebrick"),
-
- /**
- * Floral White Preset Color
- *
- */
- @XmlEnumValue("floralWhite")
- FLORAL_WHITE("floralWhite"),
-
- /**
- * Forest Green Preset Color
- *
- */
- @XmlEnumValue("forestGreen")
- FOREST_GREEN("forestGreen"),
-
- /**
- * Fuchsia Preset Color
- *
- */
- @XmlEnumValue("fuchsia")
- FUCHSIA("fuchsia"),
-
- /**
- * Gainsboro Preset Color
- *
- */
- @XmlEnumValue("gainsboro")
- GAINSBORO("gainsboro"),
-
- /**
- * Ghost White Preset Color
- *
- */
- @XmlEnumValue("ghostWhite")
- GHOST_WHITE("ghostWhite"),
-
- /**
- * Gold Preset Color
- *
- */
- @XmlEnumValue("gold")
- GOLD("gold"),
-
- /**
- * Goldenrod Preset Color
- *
- */
- @XmlEnumValue("goldenrod")
- GOLDENROD("goldenrod"),
-
- /**
- * Gray Preset Color
- *
- */
- @XmlEnumValue("gray")
- GRAY("gray"),
-
- /**
- * Green Preset Color
- *
- */
- @XmlEnumValue("green")
- GREEN("green"),
-
- /**
- * Green Yellow Preset Color
- *
- */
- @XmlEnumValue("greenYellow")
- GREEN_YELLOW("greenYellow"),
-
- /**
- * Honeydew Preset Color
- *
- */
- @XmlEnumValue("honeydew")
- HONEYDEW("honeydew"),
-
- /**
- * Hot Pink Preset Color
- *
- */
- @XmlEnumValue("hotPink")
- HOT_PINK("hotPink"),
-
- /**
- * Indian Red Preset Color
- *
- */
- @XmlEnumValue("indianRed")
- INDIAN_RED("indianRed"),
-
- /**
- * Indigo Preset Color
- *
- */
- @XmlEnumValue("indigo")
- INDIGO("indigo"),
-
- /**
- * Ivory Preset Color
- *
- */
- @XmlEnumValue("ivory")
- IVORY("ivory"),
-
- /**
- * Khaki Preset Color
- *
- */
- @XmlEnumValue("khaki")
- KHAKI("khaki"),
-
- /**
- * Lavender Preset Color
- *
- */
- @XmlEnumValue("lavender")
- LAVENDER("lavender"),
-
- /**
- * Lavender Blush Preset Color
- *
- */
- @XmlEnumValue("lavenderBlush")
- LAVENDER_BLUSH("lavenderBlush"),
-
- /**
- * Lawn Green Preset Color
- *
- */
- @XmlEnumValue("lawnGreen")
- LAWN_GREEN("lawnGreen"),
-
- /**
- * Lemon Chiffon Preset Color
- *
- */
- @XmlEnumValue("lemonChiffon")
- LEMON_CHIFFON("lemonChiffon"),
-
- /**
- * Light Blue Preset Color
- *
- */
- @XmlEnumValue("ltBlue")
- LT_BLUE("ltBlue"),
-
- /**
- * Light Coral Preset Color
- *
- */
- @XmlEnumValue("ltCoral")
- LT_CORAL("ltCoral"),
-
- /**
- * Light Cyan Preset Color
- *
- */
- @XmlEnumValue("ltCyan")
- LT_CYAN("ltCyan"),
-
- /**
- * Light Goldenrod Yellow Preset Color
- *
- */
- @XmlEnumValue("ltGoldenrodYellow")
- LT_GOLDENROD_YELLOW("ltGoldenrodYellow"),
-
- /**
- * Light Gray Preset Color
- *
- */
- @XmlEnumValue("ltGray")
- LT_GRAY("ltGray"),
-
- /**
- * Light Green Preset Color
- *
- */
- @XmlEnumValue("ltGreen")
- LT_GREEN("ltGreen"),
-
- /**
- * Light Pink Preset Color
- *
- */
- @XmlEnumValue("ltPink")
- LT_PINK("ltPink"),
-
- /**
- * Light Salmon Preset Color
- *
- */
- @XmlEnumValue("ltSalmon")
- LT_SALMON("ltSalmon"),
-
- /**
- * Light Sea Green Preset Color
- *
- */
- @XmlEnumValue("ltSeaGreen")
- LT_SEA_GREEN("ltSeaGreen"),
-
- /**
- * Light Sky Blue Preset Color
- *
- */
- @XmlEnumValue("ltSkyBlue")
- LT_SKY_BLUE("ltSkyBlue"),
-
- /**
- * Light Slate Gray Preset Color
- *
- */
- @XmlEnumValue("ltSlateGray")
- LT_SLATE_GRAY("ltSlateGray"),
-
- /**
- * Light Steel Blue Preset Color
- *
- */
- @XmlEnumValue("ltSteelBlue")
- LT_STEEL_BLUE("ltSteelBlue"),
-
- /**
- * Light Yellow Preset Color
- *
- */
- @XmlEnumValue("ltYellow")
- LT_YELLOW("ltYellow"),
-
- /**
- * Lime Preset Color
- *
- */
- @XmlEnumValue("lime")
- LIME("lime"),
-
- /**
- * Lime Green Preset Color
- *
- */
- @XmlEnumValue("limeGreen")
- LIME_GREEN("limeGreen"),
-
- /**
- * Linen Preset Color
- *
- */
- @XmlEnumValue("linen")
- LINEN("linen"),
-
- /**
- * Magenta Preset Color
- *
- */
- @XmlEnumValue("magenta")
- MAGENTA("magenta"),
-
- /**
- * Maroon Preset Color
- *
- */
- @XmlEnumValue("maroon")
- MAROON("maroon"),
-
- /**
- * Medium Aquamarine Preset Color
- *
- */
- @XmlEnumValue("medAquamarine")
- MED_AQUAMARINE("medAquamarine"),
-
- /**
- * Medium Blue Preset Color
- *
- */
- @XmlEnumValue("medBlue")
- MED_BLUE("medBlue"),
-
- /**
- * Medium Orchid Preset Color
- *
- */
- @XmlEnumValue("medOrchid")
- MED_ORCHID("medOrchid"),
-
- /**
- * Medium Purple Preset Color
- *
- */
- @XmlEnumValue("medPurple")
- MED_PURPLE("medPurple"),
-
- /**
- * Medium Sea Green Preset Color
- *
- */
- @XmlEnumValue("medSeaGreen")
- MED_SEA_GREEN("medSeaGreen"),
-
- /**
- * Medium Slate Blue Preset Color
- *
- */
- @XmlEnumValue("medSlateBlue")
- MED_SLATE_BLUE("medSlateBlue"),
-
- /**
- * Medium Spring Green Preset Color
- *
- */
- @XmlEnumValue("medSpringGreen")
- MED_SPRING_GREEN("medSpringGreen"),
-
- /**
- * Medium Turquoise Preset Color
- *
- */
- @XmlEnumValue("medTurquoise")
- MED_TURQUOISE("medTurquoise"),
-
- /**
- * Medium Violet Red Preset Color
- *
- */
- @XmlEnumValue("medVioletRed")
- MED_VIOLET_RED("medVioletRed"),
-
- /**
- * Midnight Blue Preset Color
- *
- */
- @XmlEnumValue("midnightBlue")
- MIDNIGHT_BLUE("midnightBlue"),
-
- /**
- * Mint Cream Preset Color
- *
- */
- @XmlEnumValue("mintCream")
- MINT_CREAM("mintCream"),
-
- /**
- * Misty Rose Preset Color
- *
- */
- @XmlEnumValue("mistyRose")
- MISTY_ROSE("mistyRose"),
-
- /**
- * Moccasin Preset Color
- *
- */
- @XmlEnumValue("moccasin")
- MOCCASIN("moccasin"),
-
- /**
- * Navajo White Preset Color
- *
- */
- @XmlEnumValue("navajoWhite")
- NAVAJO_WHITE("navajoWhite"),
-
- /**
- * Navy Preset Color
- *
- */
- @XmlEnumValue("navy")
- NAVY("navy"),
-
- /**
- * Old Lace Preset Color
- *
- */
- @XmlEnumValue("oldLace")
- OLD_LACE("oldLace"),
-
- /**
- * Olive Preset Color
- *
- */
- @XmlEnumValue("olive")
- OLIVE("olive"),
-
- /**
- * Olive Drab Preset Color
- *
- */
- @XmlEnumValue("oliveDrab")
- OLIVE_DRAB("oliveDrab"),
-
- /**
- * Orange Preset Color
- *
- */
- @XmlEnumValue("orange")
- ORANGE("orange"),
-
- /**
- * Orange Red Preset Color
- *
- */
- @XmlEnumValue("orangeRed")
- ORANGE_RED("orangeRed"),
-
- /**
- * Orchid Preset Color
- *
- */
- @XmlEnumValue("orchid")
- ORCHID("orchid"),
-
- /**
- * Pale Goldenrod Preset Color
- *
- */
- @XmlEnumValue("paleGoldenrod")
- PALE_GOLDENROD("paleGoldenrod"),
-
- /**
- * Pale Green Preset Color
- *
- */
- @XmlEnumValue("paleGreen")
- PALE_GREEN("paleGreen"),
-
- /**
- * Pale Turquoise Preset Color
- *
- */
- @XmlEnumValue("paleTurquoise")
- PALE_TURQUOISE("paleTurquoise"),
-
- /**
- * Pale Violet Red Preset Color
- *
- */
- @XmlEnumValue("paleVioletRed")
- PALE_VIOLET_RED("paleVioletRed"),
-
- /**
- * Papaya Whip Preset Color
- *
- */
- @XmlEnumValue("papayaWhip")
- PAPAYA_WHIP("papayaWhip"),
-
- /**
- * Peach Puff Preset Color
- *
- */
- @XmlEnumValue("peachPuff")
- PEACH_PUFF("peachPuff"),
-
- /**
- * Peru Preset Color
- *
- */
- @XmlEnumValue("peru")
- PERU("peru"),
-
- /**
- * Pink Preset Color
- *
- */
- @XmlEnumValue("pink")
- PINK("pink"),
-
- /**
- * Plum Preset Color
- *
- */
- @XmlEnumValue("plum")
- PLUM("plum"),
-
- /**
- * Powder Blue Preset Color
- *
- */
- @XmlEnumValue("powderBlue")
- POWDER_BLUE("powderBlue"),
-
- /**
- * Purple Preset Color
- *
- */
- @XmlEnumValue("purple")
- PURPLE("purple"),
-
- /**
- * Red Preset Color
- *
- */
- @XmlEnumValue("red")
- RED("red"),
-
- /**
- * Rosy Brown Preset Color
- *
- */
- @XmlEnumValue("rosyBrown")
- ROSY_BROWN("rosyBrown"),
-
- /**
- * Royal Blue Preset Color
- *
- */
- @XmlEnumValue("royalBlue")
- ROYAL_BLUE("royalBlue"),
-
- /**
- * Saddle Brown Preset Color
- *
- */
- @XmlEnumValue("saddleBrown")
- SADDLE_BROWN("saddleBrown"),
-
- /**
- * Salmon Preset Color
- *
- */
- @XmlEnumValue("salmon")
- SALMON("salmon"),
-
- /**
- * Sandy Brown Preset Color
- *
- */
- @XmlEnumValue("sandyBrown")
- SANDY_BROWN("sandyBrown"),
-
- /**
- * Sea Green Preset Color
- *
- */
- @XmlEnumValue("seaGreen")
- SEA_GREEN("seaGreen"),
-
- /**
- * Sea Shell Preset Color
- *
- */
- @XmlEnumValue("seaShell")
- SEA_SHELL("seaShell"),
-
- /**
- * Sienna Preset Color
- *
- */
- @XmlEnumValue("sienna")
- SIENNA("sienna"),
-
- /**
- * Silver Preset Color
- *
- */
- @XmlEnumValue("silver")
- SILVER("silver"),
-
- /**
- * Sky Blue Preset Color
- *
- */
- @XmlEnumValue("skyBlue")
- SKY_BLUE("skyBlue"),
-
- /**
- * Slate Blue Preset Color
- *
- */
- @XmlEnumValue("slateBlue")
- SLATE_BLUE("slateBlue"),
-
- /**
- * Slate Gray Preset Color
- *
- */
- @XmlEnumValue("slateGray")
- SLATE_GRAY("slateGray"),
-
- /**
- * Snow Preset Color
- *
- */
- @XmlEnumValue("snow")
- SNOW("snow"),
-
- /**
- * Spring Green Preset Color
- *
- */
- @XmlEnumValue("springGreen")
- SPRING_GREEN("springGreen"),
-
- /**
- * Steel Blue Preset Color
- *
- */
- @XmlEnumValue("steelBlue")
- STEEL_BLUE("steelBlue"),
-
- /**
- * Tan Preset Color
- *
- */
- @XmlEnumValue("tan")
- TAN("tan"),
-
- /**
- * Teal Preset Color
- *
- */
- @XmlEnumValue("teal")
- TEAL("teal"),
-
- /**
- * Thistle Preset Color
- *
- */
- @XmlEnumValue("thistle")
- THISTLE("thistle"),
-
- /**
- * Tomato Preset Color
- *
- */
- @XmlEnumValue("tomato")
- TOMATO("tomato"),
-
- /**
- * Turquoise Preset Color
- *
- */
- @XmlEnumValue("turquoise")
- TURQUOISE("turquoise"),
-
- /**
- * Violet Preset Color
- *
- */
- @XmlEnumValue("violet")
- VIOLET("violet"),
-
- /**
- * Wheat Preset Color
- *
- */
- @XmlEnumValue("wheat")
- WHEAT("wheat"),
-
- /**
- * White Preset Color
- *
- */
- @XmlEnumValue("white")
- WHITE("white"),
-
- /**
- * White Smoke Preset Color
- *
- */
- @XmlEnumValue("whiteSmoke")
- WHITE_SMOKE("whiteSmoke"),
-
- /**
- * Yellow Preset Color
- *
- */
- @XmlEnumValue("yellow")
- YELLOW("yellow"),
-
- /**
- * Yellow Green Preset Color
- *
- */
- @XmlEnumValue("yellowGreen")
- YELLOW_GREEN("yellowGreen");
- private final String value;
-
- STPresetColorVal(String v) {
- value = v;
- }
-
- public String value() {
- return value;
- }
-
- public static STPresetColorVal fromValue(String v) {
- for (STPresetColorVal c: STPresetColorVal.values()) {
- if (c.value.equals(v)) {
- return c;
- }
- }
- throw new IllegalArgumentException(v);
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/STRectAlignment.java b/src/java/org/apache/poi/sl/draw/binding/STRectAlignment.java
deleted file mode 100644
index ae2b64c9db..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/STRectAlignment.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for ST_RectAlignment.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="ST_RectAlignment"&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token"&gt;
- * &lt;enumeration value="tl"/&gt;
- * &lt;enumeration value="t"/&gt;
- * &lt;enumeration value="tr"/&gt;
- * &lt;enumeration value="l"/&gt;
- * &lt;enumeration value="ctr"/&gt;
- * &lt;enumeration value="r"/&gt;
- * &lt;enumeration value="bl"/&gt;
- * &lt;enumeration value="b"/&gt;
- * &lt;enumeration value="br"/&gt;
- * &lt;/restriction&gt;
- * &lt;/simpleType&gt;
- * </pre>
- *
- */
-@XmlType(name = "ST_RectAlignment")
-@XmlEnum
-public enum STRectAlignment {
-
-
- /**
- * Rectangle Alignment Enum ( Top Left )
- *
- */
- @XmlEnumValue("tl")
- TL("tl"),
-
- /**
- * Rectangle Alignment Enum ( Top )
- *
- */
- @XmlEnumValue("t")
- T("t"),
-
- /**
- * Rectangle Alignment Enum ( Top Right )
- *
- */
- @XmlEnumValue("tr")
- TR("tr"),
-
- /**
- * Rectangle Alignment Enum ( Left )
- *
- */
- @XmlEnumValue("l")
- L("l"),
-
- /**
- * Rectangle Alignment Enum ( Center )
- *
- */
- @XmlEnumValue("ctr")
- CTR("ctr"),
-
- /**
- * Rectangle Alignment Enum ( Right )
- *
- */
- @XmlEnumValue("r")
- R("r"),
-
- /**
- * Rectangle Alignment Enum ( Bottom Left )
- *
- */
- @XmlEnumValue("bl")
- BL("bl"),
-
- /**
- * Rectangle Alignment Enum ( Bottom )
- *
- */
- @XmlEnumValue("b")
- B("b"),
-
- /**
- * Rectangle Alignment Enum ( Bottom Right )
- *
- */
- @XmlEnumValue("br")
- BR("br");
- private final String value;
-
- STRectAlignment(String v) {
- value = v;
- }
-
- public String value() {
- return value;
- }
-
- public static STRectAlignment fromValue(String v) {
- for (STRectAlignment c: STRectAlignment.values()) {
- if (c.value.equals(v)) {
- return c;
- }
- }
- throw new IllegalArgumentException(v);
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/STSchemeColorVal.java b/src/java/org/apache/poi/sl/draw/binding/STSchemeColorVal.java
deleted file mode 100644
index 7c6a158b03..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/STSchemeColorVal.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for ST_SchemeColorVal.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="ST_SchemeColorVal"&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token"&gt;
- * &lt;enumeration value="bg1"/&gt;
- * &lt;enumeration value="tx1"/&gt;
- * &lt;enumeration value="bg2"/&gt;
- * &lt;enumeration value="tx2"/&gt;
- * &lt;enumeration value="accent1"/&gt;
- * &lt;enumeration value="accent2"/&gt;
- * &lt;enumeration value="accent3"/&gt;
- * &lt;enumeration value="accent4"/&gt;
- * &lt;enumeration value="accent5"/&gt;
- * &lt;enumeration value="accent6"/&gt;
- * &lt;enumeration value="hlink"/&gt;
- * &lt;enumeration value="folHlink"/&gt;
- * &lt;enumeration value="phClr"/&gt;
- * &lt;enumeration value="dk1"/&gt;
- * &lt;enumeration value="lt1"/&gt;
- * &lt;enumeration value="dk2"/&gt;
- * &lt;enumeration value="lt2"/&gt;
- * &lt;/restriction&gt;
- * &lt;/simpleType&gt;
- * </pre>
- *
- */
-@XmlType(name = "ST_SchemeColorVal")
-@XmlEnum
-public enum STSchemeColorVal {
-
-
- /**
- * Background Color 1
- *
- */
- @XmlEnumValue("bg1")
- BG_1("bg1"),
-
- /**
- * Text Color 1
- *
- */
- @XmlEnumValue("tx1")
- TX_1("tx1"),
-
- /**
- * Background Color 2
- *
- */
- @XmlEnumValue("bg2")
- BG_2("bg2"),
-
- /**
- * Text Color 2
- *
- */
- @XmlEnumValue("tx2")
- TX_2("tx2"),
-
- /**
- * Accent Color 1
- *
- */
- @XmlEnumValue("accent1")
- ACCENT_1("accent1"),
-
- /**
- * Accent Color 2
- *
- */
- @XmlEnumValue("accent2")
- ACCENT_2("accent2"),
-
- /**
- * Accent Color 3
- *
- */
- @XmlEnumValue("accent3")
- ACCENT_3("accent3"),
-
- /**
- * Accent Color 4
- *
- */
- @XmlEnumValue("accent4")
- ACCENT_4("accent4"),
-
- /**
- * Accent Color 5
- *
- */
- @XmlEnumValue("accent5")
- ACCENT_5("accent5"),
-
- /**
- * Accent Color 6
- *
- */
- @XmlEnumValue("accent6")
- ACCENT_6("accent6"),
-
- /**
- * Hyperlink Color
- *
- */
- @XmlEnumValue("hlink")
- HLINK("hlink"),
-
- /**
- * Followed Hyperlink Color
- *
- */
- @XmlEnumValue("folHlink")
- FOL_HLINK("folHlink"),
-
- /**
- * Style Color
- *
- */
- @XmlEnumValue("phClr")
- PH_CLR("phClr"),
-
- /**
- * Dark Color 1
- *
- */
- @XmlEnumValue("dk1")
- DK_1("dk1"),
-
- /**
- * Light Color 1
- *
- */
- @XmlEnumValue("lt1")
- LT_1("lt1"),
-
- /**
- * Dark Color 2
- *
- */
- @XmlEnumValue("dk2")
- DK_2("dk2"),
-
- /**
- * Light Color 2
- *
- */
- @XmlEnumValue("lt2")
- LT_2("lt2");
- private final String value;
-
- STSchemeColorVal(String v) {
- value = v;
- }
-
- public String value() {
- return value;
- }
-
- public static STSchemeColorVal fromValue(String v) {
- for (STSchemeColorVal c: STSchemeColorVal.values()) {
- if (c.value.equals(v)) {
- return c;
- }
- }
- throw new IllegalArgumentException(v);
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/STShapeType.java b/src/java/org/apache/poi/sl/draw/binding/STShapeType.java
deleted file mode 100644
index de93239f64..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/STShapeType.java
+++ /dev/null
@@ -1,1557 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for ST_ShapeType.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="ST_ShapeType"&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token"&gt;
- * &lt;enumeration value="line"/&gt;
- * &lt;enumeration value="lineInv"/&gt;
- * &lt;enumeration value="triangle"/&gt;
- * &lt;enumeration value="rtTriangle"/&gt;
- * &lt;enumeration value="rect"/&gt;
- * &lt;enumeration value="diamond"/&gt;
- * &lt;enumeration value="parallelogram"/&gt;
- * &lt;enumeration value="trapezoid"/&gt;
- * &lt;enumeration value="nonIsoscelesTrapezoid"/&gt;
- * &lt;enumeration value="pentagon"/&gt;
- * &lt;enumeration value="hexagon"/&gt;
- * &lt;enumeration value="heptagon"/&gt;
- * &lt;enumeration value="octagon"/&gt;
- * &lt;enumeration value="decagon"/&gt;
- * &lt;enumeration value="dodecagon"/&gt;
- * &lt;enumeration value="star4"/&gt;
- * &lt;enumeration value="star5"/&gt;
- * &lt;enumeration value="star6"/&gt;
- * &lt;enumeration value="star7"/&gt;
- * &lt;enumeration value="star8"/&gt;
- * &lt;enumeration value="star10"/&gt;
- * &lt;enumeration value="star12"/&gt;
- * &lt;enumeration value="star16"/&gt;
- * &lt;enumeration value="star24"/&gt;
- * &lt;enumeration value="star32"/&gt;
- * &lt;enumeration value="roundRect"/&gt;
- * &lt;enumeration value="round1Rect"/&gt;
- * &lt;enumeration value="round2SameRect"/&gt;
- * &lt;enumeration value="round2DiagRect"/&gt;
- * &lt;enumeration value="snipRoundRect"/&gt;
- * &lt;enumeration value="snip1Rect"/&gt;
- * &lt;enumeration value="snip2SameRect"/&gt;
- * &lt;enumeration value="snip2DiagRect"/&gt;
- * &lt;enumeration value="plaque"/&gt;
- * &lt;enumeration value="ellipse"/&gt;
- * &lt;enumeration value="teardrop"/&gt;
- * &lt;enumeration value="homePlate"/&gt;
- * &lt;enumeration value="chevron"/&gt;
- * &lt;enumeration value="pieWedge"/&gt;
- * &lt;enumeration value="pie"/&gt;
- * &lt;enumeration value="blockArc"/&gt;
- * &lt;enumeration value="donut"/&gt;
- * &lt;enumeration value="noSmoking"/&gt;
- * &lt;enumeration value="rightArrow"/&gt;
- * &lt;enumeration value="leftArrow"/&gt;
- * &lt;enumeration value="upArrow"/&gt;
- * &lt;enumeration value="downArrow"/&gt;
- * &lt;enumeration value="stripedRightArrow"/&gt;
- * &lt;enumeration value="notchedRightArrow"/&gt;
- * &lt;enumeration value="bentUpArrow"/&gt;
- * &lt;enumeration value="leftRightArrow"/&gt;
- * &lt;enumeration value="upDownArrow"/&gt;
- * &lt;enumeration value="leftUpArrow"/&gt;
- * &lt;enumeration value="leftRightUpArrow"/&gt;
- * &lt;enumeration value="quadArrow"/&gt;
- * &lt;enumeration value="leftArrowCallout"/&gt;
- * &lt;enumeration value="rightArrowCallout"/&gt;
- * &lt;enumeration value="upArrowCallout"/&gt;
- * &lt;enumeration value="downArrowCallout"/&gt;
- * &lt;enumeration value="leftRightArrowCallout"/&gt;
- * &lt;enumeration value="upDownArrowCallout"/&gt;
- * &lt;enumeration value="quadArrowCallout"/&gt;
- * &lt;enumeration value="bentArrow"/&gt;
- * &lt;enumeration value="uturnArrow"/&gt;
- * &lt;enumeration value="circularArrow"/&gt;
- * &lt;enumeration value="leftCircularArrow"/&gt;
- * &lt;enumeration value="leftRightCircularArrow"/&gt;
- * &lt;enumeration value="curvedRightArrow"/&gt;
- * &lt;enumeration value="curvedLeftArrow"/&gt;
- * &lt;enumeration value="curvedUpArrow"/&gt;
- * &lt;enumeration value="curvedDownArrow"/&gt;
- * &lt;enumeration value="swooshArrow"/&gt;
- * &lt;enumeration value="cube"/&gt;
- * &lt;enumeration value="can"/&gt;
- * &lt;enumeration value="lightningBolt"/&gt;
- * &lt;enumeration value="heart"/&gt;
- * &lt;enumeration value="sun"/&gt;
- * &lt;enumeration value="moon"/&gt;
- * &lt;enumeration value="smileyFace"/&gt;
- * &lt;enumeration value="irregularSeal1"/&gt;
- * &lt;enumeration value="irregularSeal2"/&gt;
- * &lt;enumeration value="foldedCorner"/&gt;
- * &lt;enumeration value="bevel"/&gt;
- * &lt;enumeration value="frame"/&gt;
- * &lt;enumeration value="halfFrame"/&gt;
- * &lt;enumeration value="corner"/&gt;
- * &lt;enumeration value="diagStripe"/&gt;
- * &lt;enumeration value="chord"/&gt;
- * &lt;enumeration value="arc"/&gt;
- * &lt;enumeration value="leftBracket"/&gt;
- * &lt;enumeration value="rightBracket"/&gt;
- * &lt;enumeration value="leftBrace"/&gt;
- * &lt;enumeration value="rightBrace"/&gt;
- * &lt;enumeration value="bracketPair"/&gt;
- * &lt;enumeration value="bracePair"/&gt;
- * &lt;enumeration value="straightConnector1"/&gt;
- * &lt;enumeration value="bentConnector2"/&gt;
- * &lt;enumeration value="bentConnector3"/&gt;
- * &lt;enumeration value="bentConnector4"/&gt;
- * &lt;enumeration value="bentConnector5"/&gt;
- * &lt;enumeration value="curvedConnector2"/&gt;
- * &lt;enumeration value="curvedConnector3"/&gt;
- * &lt;enumeration value="curvedConnector4"/&gt;
- * &lt;enumeration value="curvedConnector5"/&gt;
- * &lt;enumeration value="callout1"/&gt;
- * &lt;enumeration value="callout2"/&gt;
- * &lt;enumeration value="callout3"/&gt;
- * &lt;enumeration value="accentCallout1"/&gt;
- * &lt;enumeration value="accentCallout2"/&gt;
- * &lt;enumeration value="accentCallout3"/&gt;
- * &lt;enumeration value="borderCallout1"/&gt;
- * &lt;enumeration value="borderCallout2"/&gt;
- * &lt;enumeration value="borderCallout3"/&gt;
- * &lt;enumeration value="accentBorderCallout1"/&gt;
- * &lt;enumeration value="accentBorderCallout2"/&gt;
- * &lt;enumeration value="accentBorderCallout3"/&gt;
- * &lt;enumeration value="wedgeRectCallout"/&gt;
- * &lt;enumeration value="wedgeRoundRectCallout"/&gt;
- * &lt;enumeration value="wedgeEllipseCallout"/&gt;
- * &lt;enumeration value="cloudCallout"/&gt;
- * &lt;enumeration value="cloud"/&gt;
- * &lt;enumeration value="ribbon"/&gt;
- * &lt;enumeration value="ribbon2"/&gt;
- * &lt;enumeration value="ellipseRibbon"/&gt;
- * &lt;enumeration value="ellipseRibbon2"/&gt;
- * &lt;enumeration value="leftRightRibbon"/&gt;
- * &lt;enumeration value="verticalScroll"/&gt;
- * &lt;enumeration value="horizontalScroll"/&gt;
- * &lt;enumeration value="wave"/&gt;
- * &lt;enumeration value="doubleWave"/&gt;
- * &lt;enumeration value="plus"/&gt;
- * &lt;enumeration value="flowChartProcess"/&gt;
- * &lt;enumeration value="flowChartDecision"/&gt;
- * &lt;enumeration value="flowChartInputOutput"/&gt;
- * &lt;enumeration value="flowChartPredefinedProcess"/&gt;
- * &lt;enumeration value="flowChartInternalStorage"/&gt;
- * &lt;enumeration value="flowChartDocument"/&gt;
- * &lt;enumeration value="flowChartMultidocument"/&gt;
- * &lt;enumeration value="flowChartTerminator"/&gt;
- * &lt;enumeration value="flowChartPreparation"/&gt;
- * &lt;enumeration value="flowChartManualInput"/&gt;
- * &lt;enumeration value="flowChartManualOperation"/&gt;
- * &lt;enumeration value="flowChartConnector"/&gt;
- * &lt;enumeration value="flowChartPunchedCard"/&gt;
- * &lt;enumeration value="flowChartPunchedTape"/&gt;
- * &lt;enumeration value="flowChartSummingJunction"/&gt;
- * &lt;enumeration value="flowChartOr"/&gt;
- * &lt;enumeration value="flowChartCollate"/&gt;
- * &lt;enumeration value="flowChartSort"/&gt;
- * &lt;enumeration value="flowChartExtract"/&gt;
- * &lt;enumeration value="flowChartMerge"/&gt;
- * &lt;enumeration value="flowChartOfflineStorage"/&gt;
- * &lt;enumeration value="flowChartOnlineStorage"/&gt;
- * &lt;enumeration value="flowChartMagneticTape"/&gt;
- * &lt;enumeration value="flowChartMagneticDisk"/&gt;
- * &lt;enumeration value="flowChartMagneticDrum"/&gt;
- * &lt;enumeration value="flowChartDisplay"/&gt;
- * &lt;enumeration value="flowChartDelay"/&gt;
- * &lt;enumeration value="flowChartAlternateProcess"/&gt;
- * &lt;enumeration value="flowChartOffpageConnector"/&gt;
- * &lt;enumeration value="actionButtonBlank"/&gt;
- * &lt;enumeration value="actionButtonHome"/&gt;
- * &lt;enumeration value="actionButtonHelp"/&gt;
- * &lt;enumeration value="actionButtonInformation"/&gt;
- * &lt;enumeration value="actionButtonForwardNext"/&gt;
- * &lt;enumeration value="actionButtonBackPrevious"/&gt;
- * &lt;enumeration value="actionButtonEnd"/&gt;
- * &lt;enumeration value="actionButtonBeginning"/&gt;
- * &lt;enumeration value="actionButtonReturn"/&gt;
- * &lt;enumeration value="actionButtonDocument"/&gt;
- * &lt;enumeration value="actionButtonSound"/&gt;
- * &lt;enumeration value="actionButtonMovie"/&gt;
- * &lt;enumeration value="gear6"/&gt;
- * &lt;enumeration value="gear9"/&gt;
- * &lt;enumeration value="funnel"/&gt;
- * &lt;enumeration value="mathPlus"/&gt;
- * &lt;enumeration value="mathMinus"/&gt;
- * &lt;enumeration value="mathMultiply"/&gt;
- * &lt;enumeration value="mathDivide"/&gt;
- * &lt;enumeration value="mathEqual"/&gt;
- * &lt;enumeration value="mathNotEqual"/&gt;
- * &lt;enumeration value="cornerTabs"/&gt;
- * &lt;enumeration value="squareTabs"/&gt;
- * &lt;enumeration value="plaqueTabs"/&gt;
- * &lt;enumeration value="chartX"/&gt;
- * &lt;enumeration value="chartStar"/&gt;
- * &lt;enumeration value="chartPlus"/&gt;
- * &lt;/restriction&gt;
- * &lt;/simpleType&gt;
- * </pre>
- *
- */
-@XmlType(name = "ST_ShapeType")
-@XmlEnum
-public enum STShapeType {
-
-
- /**
- * Line Shape
- *
- */
- @XmlEnumValue("line")
- LINE("line"),
-
- /**
- * Line Inverse Shape
- *
- */
- @XmlEnumValue("lineInv")
- LINE_INV("lineInv"),
-
- /**
- * Triangle Shape
- *
- */
- @XmlEnumValue("triangle")
- TRIANGLE("triangle"),
-
- /**
- * Right Triangle Shape
- *
- */
- @XmlEnumValue("rtTriangle")
- RT_TRIANGLE("rtTriangle"),
-
- /**
- * Rectangle Shape
- *
- */
- @XmlEnumValue("rect")
- RECT("rect"),
-
- /**
- * Diamond Shape
- *
- */
- @XmlEnumValue("diamond")
- DIAMOND("diamond"),
-
- /**
- * Parallelogram Shape
- *
- */
- @XmlEnumValue("parallelogram")
- PARALLELOGRAM("parallelogram"),
-
- /**
- * Trapezoid Shape
- *
- */
- @XmlEnumValue("trapezoid")
- TRAPEZOID("trapezoid"),
-
- /**
- * Non-Isosceles Trapezoid Shape
- *
- */
- @XmlEnumValue("nonIsoscelesTrapezoid")
- NON_ISOSCELES_TRAPEZOID("nonIsoscelesTrapezoid"),
-
- /**
- * Pentagon Shape
- *
- */
- @XmlEnumValue("pentagon")
- PENTAGON("pentagon"),
-
- /**
- * Hexagon Shape
- *
- */
- @XmlEnumValue("hexagon")
- HEXAGON("hexagon"),
-
- /**
- * Heptagon Shape
- *
- */
- @XmlEnumValue("heptagon")
- HEPTAGON("heptagon"),
-
- /**
- * Octagon Shape
- *
- */
- @XmlEnumValue("octagon")
- OCTAGON("octagon"),
-
- /**
- * Decagon Shape
- *
- */
- @XmlEnumValue("decagon")
- DECAGON("decagon"),
-
- /**
- * Dodecagon Shape
- *
- */
- @XmlEnumValue("dodecagon")
- DODECAGON("dodecagon"),
-
- /**
- * Four Pointed Star Shape
- *
- */
- @XmlEnumValue("star4")
- STAR_4("star4"),
-
- /**
- * Five Pointed Star Shape
- *
- */
- @XmlEnumValue("star5")
- STAR_5("star5"),
-
- /**
- * Six Pointed Star Shape
- *
- */
- @XmlEnumValue("star6")
- STAR_6("star6"),
-
- /**
- * Seven Pointed Star Shape
- *
- */
- @XmlEnumValue("star7")
- STAR_7("star7"),
-
- /**
- * Eight Pointed Star Shape
- *
- */
- @XmlEnumValue("star8")
- STAR_8("star8"),
-
- /**
- * Ten Pointed Star Shape
- *
- */
- @XmlEnumValue("star10")
- STAR_10("star10"),
-
- /**
- * Twelve Pointed Star Shape
- *
- */
- @XmlEnumValue("star12")
- STAR_12("star12"),
-
- /**
- * Sixteen Pointed Star Shape
- *
- */
- @XmlEnumValue("star16")
- STAR_16("star16"),
-
- /**
- * Twenty Four Pointed Star Shape
- *
- */
- @XmlEnumValue("star24")
- STAR_24("star24"),
-
- /**
- * Thirty Two Pointed Star Shape
- *
- */
- @XmlEnumValue("star32")
- STAR_32("star32"),
-
- /**
- * Round Corner Rectangle Shape
- *
- */
- @XmlEnumValue("roundRect")
- ROUND_RECT("roundRect"),
-
- /**
- * One Round Corner Rectangle Shape
- *
- */
- @XmlEnumValue("round1Rect")
- ROUND_1_RECT("round1Rect"),
-
- /**
- * Two Same-side Round Corner Rectangle Shape
- *
- */
- @XmlEnumValue("round2SameRect")
- ROUND_2_SAME_RECT("round2SameRect"),
-
- /**
- * Two Diagonal Round Corner Rectangle Shape
- *
- */
- @XmlEnumValue("round2DiagRect")
- ROUND_2_DIAG_RECT("round2DiagRect"),
-
- /**
- * One Snip One Round Corner Rectangle Shape
- *
- */
- @XmlEnumValue("snipRoundRect")
- SNIP_ROUND_RECT("snipRoundRect"),
-
- /**
- * One Snip Corner Rectangle Shape
- *
- */
- @XmlEnumValue("snip1Rect")
- SNIP_1_RECT("snip1Rect"),
-
- /**
- * Two Same-side Snip Corner Rectangle Shape
- *
- */
- @XmlEnumValue("snip2SameRect")
- SNIP_2_SAME_RECT("snip2SameRect"),
-
- /**
- * Two Diagonal Snip Corner Rectangle Shape
- *
- */
- @XmlEnumValue("snip2DiagRect")
- SNIP_2_DIAG_RECT("snip2DiagRect"),
-
- /**
- * Plaque Shape
- *
- */
- @XmlEnumValue("plaque")
- PLAQUE("plaque"),
-
- /**
- * Ellipse Shape
- *
- */
- @XmlEnumValue("ellipse")
- ELLIPSE("ellipse"),
-
- /**
- * Teardrop Shape
- *
- */
- @XmlEnumValue("teardrop")
- TEARDROP("teardrop"),
-
- /**
- * Home Plate Shape
- *
- */
- @XmlEnumValue("homePlate")
- HOME_PLATE("homePlate"),
-
- /**
- * Chevron Shape
- *
- */
- @XmlEnumValue("chevron")
- CHEVRON("chevron"),
-
- /**
- * Pie Wedge Shape
- *
- */
- @XmlEnumValue("pieWedge")
- PIE_WEDGE("pieWedge"),
-
- /**
- * Pie Shape
- *
- */
- @XmlEnumValue("pie")
- PIE("pie"),
-
- /**
- * Block Arc Shape
- *
- */
- @XmlEnumValue("blockArc")
- BLOCK_ARC("blockArc"),
-
- /**
- * Donut Shape
- *
- */
- @XmlEnumValue("donut")
- DONUT("donut"),
-
- /**
- * No Smoking Shape
- *
- */
- @XmlEnumValue("noSmoking")
- NO_SMOKING("noSmoking"),
-
- /**
- * Right Arrow Shape
- *
- */
- @XmlEnumValue("rightArrow")
- RIGHT_ARROW("rightArrow"),
-
- /**
- * Left Arrow Shape
- *
- */
- @XmlEnumValue("leftArrow")
- LEFT_ARROW("leftArrow"),
-
- /**
- * Up Arrow Shape
- *
- */
- @XmlEnumValue("upArrow")
- UP_ARROW("upArrow"),
-
- /**
- * Down Arrow Shape
- *
- */
- @XmlEnumValue("downArrow")
- DOWN_ARROW("downArrow"),
-
- /**
- * Striped Right Arrow Shape
- *
- */
- @XmlEnumValue("stripedRightArrow")
- STRIPED_RIGHT_ARROW("stripedRightArrow"),
-
- /**
- * Notched Right Arrow Shape
- *
- */
- @XmlEnumValue("notchedRightArrow")
- NOTCHED_RIGHT_ARROW("notchedRightArrow"),
-
- /**
- * Bent Up Arrow Shape
- *
- */
- @XmlEnumValue("bentUpArrow")
- BENT_UP_ARROW("bentUpArrow"),
-
- /**
- * Left Right Arrow Shape
- *
- */
- @XmlEnumValue("leftRightArrow")
- LEFT_RIGHT_ARROW("leftRightArrow"),
-
- /**
- * Up Down Arrow Shape
- *
- */
- @XmlEnumValue("upDownArrow")
- UP_DOWN_ARROW("upDownArrow"),
-
- /**
- * Left Up Arrow Shape
- *
- */
- @XmlEnumValue("leftUpArrow")
- LEFT_UP_ARROW("leftUpArrow"),
-
- /**
- * Left Right Up Arrow Shape
- *
- */
- @XmlEnumValue("leftRightUpArrow")
- LEFT_RIGHT_UP_ARROW("leftRightUpArrow"),
-
- /**
- * Quad-Arrow Shape
- *
- */
- @XmlEnumValue("quadArrow")
- QUAD_ARROW("quadArrow"),
-
- /**
- * Callout Left Arrow Shape
- *
- */
- @XmlEnumValue("leftArrowCallout")
- LEFT_ARROW_CALLOUT("leftArrowCallout"),
-
- /**
- * Callout Right Arrow Shape
- *
- */
- @XmlEnumValue("rightArrowCallout")
- RIGHT_ARROW_CALLOUT("rightArrowCallout"),
-
- /**
- * Callout Up Arrow Shape
- *
- */
- @XmlEnumValue("upArrowCallout")
- UP_ARROW_CALLOUT("upArrowCallout"),
-
- /**
- * Callout Down Arrow Shape
- *
- */
- @XmlEnumValue("downArrowCallout")
- DOWN_ARROW_CALLOUT("downArrowCallout"),
-
- /**
- * Callout Left Right Arrow Shape
- *
- */
- @XmlEnumValue("leftRightArrowCallout")
- LEFT_RIGHT_ARROW_CALLOUT("leftRightArrowCallout"),
-
- /**
- * Callout Up Down Arrow Shape
- *
- */
- @XmlEnumValue("upDownArrowCallout")
- UP_DOWN_ARROW_CALLOUT("upDownArrowCallout"),
-
- /**
- * Callout Quad-Arrow Shape
- *
- */
- @XmlEnumValue("quadArrowCallout")
- QUAD_ARROW_CALLOUT("quadArrowCallout"),
-
- /**
- * Bent Arrow Shape
- *
- */
- @XmlEnumValue("bentArrow")
- BENT_ARROW("bentArrow"),
-
- /**
- * U-Turn Arrow Shape
- *
- */
- @XmlEnumValue("uturnArrow")
- UTURN_ARROW("uturnArrow"),
-
- /**
- * Circular Arrow Shape
- *
- */
- @XmlEnumValue("circularArrow")
- CIRCULAR_ARROW("circularArrow"),
-
- /**
- * Left Circular Arrow Shape
- *
- */
- @XmlEnumValue("leftCircularArrow")
- LEFT_CIRCULAR_ARROW("leftCircularArrow"),
-
- /**
- * Left Right Circular Arrow Shape
- *
- */
- @XmlEnumValue("leftRightCircularArrow")
- LEFT_RIGHT_CIRCULAR_ARROW("leftRightCircularArrow"),
-
- /**
- * Curved Right Arrow Shape
- *
- */
- @XmlEnumValue("curvedRightArrow")
- CURVED_RIGHT_ARROW("curvedRightArrow"),
-
- /**
- * Curved Left Arrow Shape
- *
- */
- @XmlEnumValue("curvedLeftArrow")
- CURVED_LEFT_ARROW("curvedLeftArrow"),
-
- /**
- * Curved Up Arrow Shape
- *
- */
- @XmlEnumValue("curvedUpArrow")
- CURVED_UP_ARROW("curvedUpArrow"),
-
- /**
- * Curved Down Arrow Shape
- *
- */
- @XmlEnumValue("curvedDownArrow")
- CURVED_DOWN_ARROW("curvedDownArrow"),
-
- /**
- * Swoosh Arrow Shape
- *
- */
- @XmlEnumValue("swooshArrow")
- SWOOSH_ARROW("swooshArrow"),
-
- /**
- * Cube Shape
- *
- */
- @XmlEnumValue("cube")
- CUBE("cube"),
-
- /**
- * Can Shape
- *
- */
- @XmlEnumValue("can")
- CAN("can"),
-
- /**
- * Lightning Bolt Shape
- *
- */
- @XmlEnumValue("lightningBolt")
- LIGHTNING_BOLT("lightningBolt"),
-
- /**
- * Heart Shape
- *
- */
- @XmlEnumValue("heart")
- HEART("heart"),
-
- /**
- * Sun Shape
- *
- */
- @XmlEnumValue("sun")
- SUN("sun"),
-
- /**
- * Moon Shape
- *
- */
- @XmlEnumValue("moon")
- MOON("moon"),
-
- /**
- * Smiley Face Shape
- *
- */
- @XmlEnumValue("smileyFace")
- SMILEY_FACE("smileyFace"),
-
- /**
- * Irregular Seal 1 Shape
- *
- */
- @XmlEnumValue("irregularSeal1")
- IRREGULAR_SEAL_1("irregularSeal1"),
-
- /**
- * Irregular Seal 2 Shape
- *
- */
- @XmlEnumValue("irregularSeal2")
- IRREGULAR_SEAL_2("irregularSeal2"),
-
- /**
- * Folded Corner Shape
- *
- */
- @XmlEnumValue("foldedCorner")
- FOLDED_CORNER("foldedCorner"),
-
- /**
- * Bevel Shape
- *
- */
- @XmlEnumValue("bevel")
- BEVEL("bevel"),
-
- /**
- * Frame Shape
- *
- */
- @XmlEnumValue("frame")
- FRAME("frame"),
-
- /**
- * Half Frame Shape
- *
- */
- @XmlEnumValue("halfFrame")
- HALF_FRAME("halfFrame"),
-
- /**
- * Corner Shape
- *
- */
- @XmlEnumValue("corner")
- CORNER("corner"),
-
- /**
- * Diagonal Stripe Shape
- *
- */
- @XmlEnumValue("diagStripe")
- DIAG_STRIPE("diagStripe"),
-
- /**
- * Chord Shape
- *
- */
- @XmlEnumValue("chord")
- CHORD("chord"),
-
- /**
- * Curved Arc Shape
- *
- */
- @XmlEnumValue("arc")
- ARC("arc"),
-
- /**
- * Left Bracket Shape
- *
- */
- @XmlEnumValue("leftBracket")
- LEFT_BRACKET("leftBracket"),
-
- /**
- * Right Bracket Shape
- *
- */
- @XmlEnumValue("rightBracket")
- RIGHT_BRACKET("rightBracket"),
-
- /**
- * Left Brace Shape
- *
- */
- @XmlEnumValue("leftBrace")
- LEFT_BRACE("leftBrace"),
-
- /**
- * Right Brace Shape
- *
- */
- @XmlEnumValue("rightBrace")
- RIGHT_BRACE("rightBrace"),
-
- /**
- * Bracket Pair Shape
- *
- */
- @XmlEnumValue("bracketPair")
- BRACKET_PAIR("bracketPair"),
-
- /**
- * Brace Pair Shape
- *
- */
- @XmlEnumValue("bracePair")
- BRACE_PAIR("bracePair"),
-
- /**
- * Straight Connector 1 Shape
- *
- */
- @XmlEnumValue("straightConnector1")
- STRAIGHT_CONNECTOR_1("straightConnector1"),
-
- /**
- * Bent Connector 2 Shape
- *
- */
- @XmlEnumValue("bentConnector2")
- BENT_CONNECTOR_2("bentConnector2"),
-
- /**
- * Bent Connector 3 Shape
- *
- */
- @XmlEnumValue("bentConnector3")
- BENT_CONNECTOR_3("bentConnector3"),
-
- /**
- * Bent Connector 4 Shape
- *
- */
- @XmlEnumValue("bentConnector4")
- BENT_CONNECTOR_4("bentConnector4"),
-
- /**
- * Bent Connector 5 Shape
- *
- */
- @XmlEnumValue("bentConnector5")
- BENT_CONNECTOR_5("bentConnector5"),
-
- /**
- * Curved Connector 2 Shape
- *
- */
- @XmlEnumValue("curvedConnector2")
- CURVED_CONNECTOR_2("curvedConnector2"),
-
- /**
- * Curved Connector 3 Shape
- *
- */
- @XmlEnumValue("curvedConnector3")
- CURVED_CONNECTOR_3("curvedConnector3"),
-
- /**
- * Curved Connector 4 Shape
- *
- */
- @XmlEnumValue("curvedConnector4")
- CURVED_CONNECTOR_4("curvedConnector4"),
-
- /**
- * Curved Connector 5 Shape
- *
- */
- @XmlEnumValue("curvedConnector5")
- CURVED_CONNECTOR_5("curvedConnector5"),
-
- /**
- * Callout 1 Shape
- *
- */
- @XmlEnumValue("callout1")
- CALLOUT_1("callout1"),
-
- /**
- * Callout 2 Shape
- *
- */
- @XmlEnumValue("callout2")
- CALLOUT_2("callout2"),
-
- /**
- * Callout 3 Shape
- *
- */
- @XmlEnumValue("callout3")
- CALLOUT_3("callout3"),
-
- /**
- * Callout 1 Shape
- *
- */
- @XmlEnumValue("accentCallout1")
- ACCENT_CALLOUT_1("accentCallout1"),
-
- /**
- * Callout 2 Shape
- *
- */
- @XmlEnumValue("accentCallout2")
- ACCENT_CALLOUT_2("accentCallout2"),
-
- /**
- * Callout 3 Shape
- *
- */
- @XmlEnumValue("accentCallout3")
- ACCENT_CALLOUT_3("accentCallout3"),
-
- /**
- * Callout 1 with Border Shape
- *
- */
- @XmlEnumValue("borderCallout1")
- BORDER_CALLOUT_1("borderCallout1"),
-
- /**
- * Callout 2 with Border Shape
- *
- */
- @XmlEnumValue("borderCallout2")
- BORDER_CALLOUT_2("borderCallout2"),
-
- /**
- * Callout 3 with Border Shape
- *
- */
- @XmlEnumValue("borderCallout3")
- BORDER_CALLOUT_3("borderCallout3"),
-
- /**
- * Callout 1 with Border and Accent Shape
- *
- */
- @XmlEnumValue("accentBorderCallout1")
- ACCENT_BORDER_CALLOUT_1("accentBorderCallout1"),
-
- /**
- * Callout 2 with Border and Accent Shape
- *
- */
- @XmlEnumValue("accentBorderCallout2")
- ACCENT_BORDER_CALLOUT_2("accentBorderCallout2"),
-
- /**
- * Callout 3 with Border and Accent Shape
- *
- */
- @XmlEnumValue("accentBorderCallout3")
- ACCENT_BORDER_CALLOUT_3("accentBorderCallout3"),
-
- /**
- * Callout Wedge Rectangle Shape
- *
- */
- @XmlEnumValue("wedgeRectCallout")
- WEDGE_RECT_CALLOUT("wedgeRectCallout"),
-
- /**
- * Callout Wedge Round Rectangle Shape
- *
- */
- @XmlEnumValue("wedgeRoundRectCallout")
- WEDGE_ROUND_RECT_CALLOUT("wedgeRoundRectCallout"),
-
- /**
- * Callout Wedge Ellipse Shape
- *
- */
- @XmlEnumValue("wedgeEllipseCallout")
- WEDGE_ELLIPSE_CALLOUT("wedgeEllipseCallout"),
-
- /**
- * Callout Cloud Shape
- *
- */
- @XmlEnumValue("cloudCallout")
- CLOUD_CALLOUT("cloudCallout"),
-
- /**
- * Cloud Shape
- *
- */
- @XmlEnumValue("cloud")
- CLOUD("cloud"),
-
- /**
- * Ribbon Shape
- *
- */
- @XmlEnumValue("ribbon")
- RIBBON("ribbon"),
-
- /**
- * Ribbon 2 Shape
- *
- */
- @XmlEnumValue("ribbon2")
- RIBBON_2("ribbon2"),
-
- /**
- * Ellipse Ribbon Shape
- *
- */
- @XmlEnumValue("ellipseRibbon")
- ELLIPSE_RIBBON("ellipseRibbon"),
-
- /**
- * Ellipse Ribbon 2 Shape
- *
- */
- @XmlEnumValue("ellipseRibbon2")
- ELLIPSE_RIBBON_2("ellipseRibbon2"),
-
- /**
- * Left Right Ribbon Shape
- *
- */
- @XmlEnumValue("leftRightRibbon")
- LEFT_RIGHT_RIBBON("leftRightRibbon"),
-
- /**
- * Vertical Scroll Shape
- *
- */
- @XmlEnumValue("verticalScroll")
- VERTICAL_SCROLL("verticalScroll"),
-
- /**
- * Horizontal Scroll Shape
- *
- */
- @XmlEnumValue("horizontalScroll")
- HORIZONTAL_SCROLL("horizontalScroll"),
-
- /**
- * Wave Shape
- *
- */
- @XmlEnumValue("wave")
- WAVE("wave"),
-
- /**
- * Double Wave Shape
- *
- */
- @XmlEnumValue("doubleWave")
- DOUBLE_WAVE("doubleWave"),
-
- /**
- * Plus Shape
- *
- */
- @XmlEnumValue("plus")
- PLUS("plus"),
-
- /**
- * Process Flow Shape
- *
- */
- @XmlEnumValue("flowChartProcess")
- FLOW_CHART_PROCESS("flowChartProcess"),
-
- /**
- * Decision Flow Shape
- *
- */
- @XmlEnumValue("flowChartDecision")
- FLOW_CHART_DECISION("flowChartDecision"),
-
- /**
- * Input Output Flow Shape
- *
- */
- @XmlEnumValue("flowChartInputOutput")
- FLOW_CHART_INPUT_OUTPUT("flowChartInputOutput"),
-
- /**
- * Predefined Process Flow Shape
- *
- */
- @XmlEnumValue("flowChartPredefinedProcess")
- FLOW_CHART_PREDEFINED_PROCESS("flowChartPredefinedProcess"),
-
- /**
- * Internal Storage Flow Shape
- *
- */
- @XmlEnumValue("flowChartInternalStorage")
- FLOW_CHART_INTERNAL_STORAGE("flowChartInternalStorage"),
-
- /**
- * Document Flow Shape
- *
- */
- @XmlEnumValue("flowChartDocument")
- FLOW_CHART_DOCUMENT("flowChartDocument"),
-
- /**
- * Multi-Document Flow Shape
- *
- */
- @XmlEnumValue("flowChartMultidocument")
- FLOW_CHART_MULTIDOCUMENT("flowChartMultidocument"),
-
- /**
- * Terminator Flow Shape
- *
- */
- @XmlEnumValue("flowChartTerminator")
- FLOW_CHART_TERMINATOR("flowChartTerminator"),
-
- /**
- * Preparation Flow Shape
- *
- */
- @XmlEnumValue("flowChartPreparation")
- FLOW_CHART_PREPARATION("flowChartPreparation"),
-
- /**
- * Manual Input Flow Shape
- *
- */
- @XmlEnumValue("flowChartManualInput")
- FLOW_CHART_MANUAL_INPUT("flowChartManualInput"),
-
- /**
- * Manual Operation Flow Shape
- *
- */
- @XmlEnumValue("flowChartManualOperation")
- FLOW_CHART_MANUAL_OPERATION("flowChartManualOperation"),
-
- /**
- * Connector Flow Shape
- *
- */
- @XmlEnumValue("flowChartConnector")
- FLOW_CHART_CONNECTOR("flowChartConnector"),
-
- /**
- * Punched Card Flow Shape
- *
- */
- @XmlEnumValue("flowChartPunchedCard")
- FLOW_CHART_PUNCHED_CARD("flowChartPunchedCard"),
-
- /**
- * Punched Tape Flow Shape
- *
- */
- @XmlEnumValue("flowChartPunchedTape")
- FLOW_CHART_PUNCHED_TAPE("flowChartPunchedTape"),
-
- /**
- * Summing Junction Flow Shape
- *
- */
- @XmlEnumValue("flowChartSummingJunction")
- FLOW_CHART_SUMMING_JUNCTION("flowChartSummingJunction"),
-
- /**
- * Or Flow Shape
- *
- */
- @XmlEnumValue("flowChartOr")
- FLOW_CHART_OR("flowChartOr"),
-
- /**
- * Collate Flow Shape
- *
- */
- @XmlEnumValue("flowChartCollate")
- FLOW_CHART_COLLATE("flowChartCollate"),
-
- /**
- * Sort Flow Shape
- *
- */
- @XmlEnumValue("flowChartSort")
- FLOW_CHART_SORT("flowChartSort"),
-
- /**
- * Extract Flow Shape
- *
- */
- @XmlEnumValue("flowChartExtract")
- FLOW_CHART_EXTRACT("flowChartExtract"),
-
- /**
- * Merge Flow Shape
- *
- */
- @XmlEnumValue("flowChartMerge")
- FLOW_CHART_MERGE("flowChartMerge"),
-
- /**
- * Offline Storage Flow Shape
- *
- */
- @XmlEnumValue("flowChartOfflineStorage")
- FLOW_CHART_OFFLINE_STORAGE("flowChartOfflineStorage"),
-
- /**
- * Online Storage Flow Shape
- *
- */
- @XmlEnumValue("flowChartOnlineStorage")
- FLOW_CHART_ONLINE_STORAGE("flowChartOnlineStorage"),
-
- /**
- * Magnetic Tape Flow Shape
- *
- */
- @XmlEnumValue("flowChartMagneticTape")
- FLOW_CHART_MAGNETIC_TAPE("flowChartMagneticTape"),
-
- /**
- * Magnetic Disk Flow Shape
- *
- */
- @XmlEnumValue("flowChartMagneticDisk")
- FLOW_CHART_MAGNETIC_DISK("flowChartMagneticDisk"),
-
- /**
- * Magnetic Drum Flow Shape
- *
- */
- @XmlEnumValue("flowChartMagneticDrum")
- FLOW_CHART_MAGNETIC_DRUM("flowChartMagneticDrum"),
-
- /**
- * Display Flow Shape
- *
- */
- @XmlEnumValue("flowChartDisplay")
- FLOW_CHART_DISPLAY("flowChartDisplay"),
-
- /**
- * Delay Flow Shape
- *
- */
- @XmlEnumValue("flowChartDelay")
- FLOW_CHART_DELAY("flowChartDelay"),
-
- /**
- * Alternate Process Flow Shape
- *
- */
- @XmlEnumValue("flowChartAlternateProcess")
- FLOW_CHART_ALTERNATE_PROCESS("flowChartAlternateProcess"),
-
- /**
- * Off-Page Connector Flow Shape
- *
- */
- @XmlEnumValue("flowChartOffpageConnector")
- FLOW_CHART_OFFPAGE_CONNECTOR("flowChartOffpageConnector"),
-
- /**
- * Blank Button Shape
- *
- */
- @XmlEnumValue("actionButtonBlank")
- ACTION_BUTTON_BLANK("actionButtonBlank"),
-
- /**
- * Home Button Shape
- *
- */
- @XmlEnumValue("actionButtonHome")
- ACTION_BUTTON_HOME("actionButtonHome"),
-
- /**
- * Help Button Shape
- *
- */
- @XmlEnumValue("actionButtonHelp")
- ACTION_BUTTON_HELP("actionButtonHelp"),
-
- /**
- * Information Button Shape
- *
- */
- @XmlEnumValue("actionButtonInformation")
- ACTION_BUTTON_INFORMATION("actionButtonInformation"),
-
- /**
- * Forward or Next Button Shape
- *
- */
- @XmlEnumValue("actionButtonForwardNext")
- ACTION_BUTTON_FORWARD_NEXT("actionButtonForwardNext"),
-
- /**
- * Back or Previous Button Shape
- *
- */
- @XmlEnumValue("actionButtonBackPrevious")
- ACTION_BUTTON_BACK_PREVIOUS("actionButtonBackPrevious"),
-
- /**
- * End Button Shape
- *
- */
- @XmlEnumValue("actionButtonEnd")
- ACTION_BUTTON_END("actionButtonEnd"),
-
- /**
- * Beginning Button Shape
- *
- */
- @XmlEnumValue("actionButtonBeginning")
- ACTION_BUTTON_BEGINNING("actionButtonBeginning"),
-
- /**
- * Return Button Shape
- *
- */
- @XmlEnumValue("actionButtonReturn")
- ACTION_BUTTON_RETURN("actionButtonReturn"),
-
- /**
- * Document Button Shape
- *
- */
- @XmlEnumValue("actionButtonDocument")
- ACTION_BUTTON_DOCUMENT("actionButtonDocument"),
-
- /**
- * Sound Button Shape
- *
- */
- @XmlEnumValue("actionButtonSound")
- ACTION_BUTTON_SOUND("actionButtonSound"),
-
- /**
- * Movie Button Shape
- *
- */
- @XmlEnumValue("actionButtonMovie")
- ACTION_BUTTON_MOVIE("actionButtonMovie"),
-
- /**
- * Gear 6 Shape
- *
- */
- @XmlEnumValue("gear6")
- GEAR_6("gear6"),
-
- /**
- * Gear 9 Shape
- *
- */
- @XmlEnumValue("gear9")
- GEAR_9("gear9"),
-
- /**
- * Funnel Shape
- *
- */
- @XmlEnumValue("funnel")
- FUNNEL("funnel"),
-
- /**
- * Plus Math Shape
- *
- */
- @XmlEnumValue("mathPlus")
- MATH_PLUS("mathPlus"),
-
- /**
- * Minus Math Shape
- *
- */
- @XmlEnumValue("mathMinus")
- MATH_MINUS("mathMinus"),
-
- /**
- * Multiply Math Shape
- *
- */
- @XmlEnumValue("mathMultiply")
- MATH_MULTIPLY("mathMultiply"),
-
- /**
- * Divide Math Shape
- *
- */
- @XmlEnumValue("mathDivide")
- MATH_DIVIDE("mathDivide"),
-
- /**
- * Equal Math Shape
- *
- */
- @XmlEnumValue("mathEqual")
- MATH_EQUAL("mathEqual"),
-
- /**
- * Not Equal Math Shape
- *
- */
- @XmlEnumValue("mathNotEqual")
- MATH_NOT_EQUAL("mathNotEqual"),
-
- /**
- * Corner Tabs Shape
- *
- */
- @XmlEnumValue("cornerTabs")
- CORNER_TABS("cornerTabs"),
-
- /**
- * Square Tabs Shape
- *
- */
- @XmlEnumValue("squareTabs")
- SQUARE_TABS("squareTabs"),
-
- /**
- * Plaque Tabs Shape
- *
- */
- @XmlEnumValue("plaqueTabs")
- PLAQUE_TABS("plaqueTabs"),
-
- /**
- * Chart X Shape
- *
- */
- @XmlEnumValue("chartX")
- CHART_X("chartX"),
-
- /**
- * Chart Star Shape
- *
- */
- @XmlEnumValue("chartStar")
- CHART_STAR("chartStar"),
-
- /**
- * Chart Plus Shape
- *
- */
- @XmlEnumValue("chartPlus")
- CHART_PLUS("chartPlus");
- private final String value;
-
- STShapeType(String v) {
- value = v;
- }
-
- public String value() {
- return value;
- }
-
- public static STShapeType fromValue(String v) {
- for (STShapeType c: STShapeType.values()) {
- if (c.value.equals(v)) {
- return c;
- }
- }
- throw new IllegalArgumentException(v);
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/STTextShapeType.java b/src/java/org/apache/poi/sl/draw/binding/STTextShapeType.java
deleted file mode 100644
index 26740ab15f..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/STTextShapeType.java
+++ /dev/null
@@ -1,389 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for ST_TextShapeType.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="ST_TextShapeType"&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token"&gt;
- * &lt;enumeration value="textNoShape"/&gt;
- * &lt;enumeration value="textPlain"/&gt;
- * &lt;enumeration value="textStop"/&gt;
- * &lt;enumeration value="textTriangle"/&gt;
- * &lt;enumeration value="textTriangleInverted"/&gt;
- * &lt;enumeration value="textChevron"/&gt;
- * &lt;enumeration value="textChevronInverted"/&gt;
- * &lt;enumeration value="textRingInside"/&gt;
- * &lt;enumeration value="textRingOutside"/&gt;
- * &lt;enumeration value="textArchUp"/&gt;
- * &lt;enumeration value="textArchDown"/&gt;
- * &lt;enumeration value="textCircle"/&gt;
- * &lt;enumeration value="textButton"/&gt;
- * &lt;enumeration value="textArchUpPour"/&gt;
- * &lt;enumeration value="textArchDownPour"/&gt;
- * &lt;enumeration value="textCirclePour"/&gt;
- * &lt;enumeration value="textButtonPour"/&gt;
- * &lt;enumeration value="textCurveUp"/&gt;
- * &lt;enumeration value="textCurveDown"/&gt;
- * &lt;enumeration value="textCanUp"/&gt;
- * &lt;enumeration value="textCanDown"/&gt;
- * &lt;enumeration value="textWave1"/&gt;
- * &lt;enumeration value="textWave2"/&gt;
- * &lt;enumeration value="textDoubleWave1"/&gt;
- * &lt;enumeration value="textWave4"/&gt;
- * &lt;enumeration value="textInflate"/&gt;
- * &lt;enumeration value="textDeflate"/&gt;
- * &lt;enumeration value="textInflateBottom"/&gt;
- * &lt;enumeration value="textDeflateBottom"/&gt;
- * &lt;enumeration value="textInflateTop"/&gt;
- * &lt;enumeration value="textDeflateTop"/&gt;
- * &lt;enumeration value="textDeflateInflate"/&gt;
- * &lt;enumeration value="textDeflateInflateDeflate"/&gt;
- * &lt;enumeration value="textFadeRight"/&gt;
- * &lt;enumeration value="textFadeLeft"/&gt;
- * &lt;enumeration value="textFadeUp"/&gt;
- * &lt;enumeration value="textFadeDown"/&gt;
- * &lt;enumeration value="textSlantUp"/&gt;
- * &lt;enumeration value="textSlantDown"/&gt;
- * &lt;enumeration value="textCascadeUp"/&gt;
- * &lt;enumeration value="textCascadeDown"/&gt;
- * &lt;/restriction&gt;
- * &lt;/simpleType&gt;
- * </pre>
- *
- */
-@XmlType(name = "ST_TextShapeType")
-@XmlEnum
-public enum STTextShapeType {
-
-
- /**
- * No Text Shape
- *
- */
- @XmlEnumValue("textNoShape")
- TEXT_NO_SHAPE("textNoShape"),
-
- /**
- * Plain Text Shape
- *
- */
- @XmlEnumValue("textPlain")
- TEXT_PLAIN("textPlain"),
-
- /**
- * Stop Sign Text Shape
- *
- */
- @XmlEnumValue("textStop")
- TEXT_STOP("textStop"),
-
- /**
- * Triangle Text Shape
- *
- */
- @XmlEnumValue("textTriangle")
- TEXT_TRIANGLE("textTriangle"),
-
- /**
- * Inverted Triangle Text Shape
- *
- */
- @XmlEnumValue("textTriangleInverted")
- TEXT_TRIANGLE_INVERTED("textTriangleInverted"),
-
- /**
- * Chevron Text Shape
- *
- */
- @XmlEnumValue("textChevron")
- TEXT_CHEVRON("textChevron"),
-
- /**
- * Inverted Chevron Text Shape
- *
- */
- @XmlEnumValue("textChevronInverted")
- TEXT_CHEVRON_INVERTED("textChevronInverted"),
-
- /**
- * Inside Ring Text Shape
- *
- */
- @XmlEnumValue("textRingInside")
- TEXT_RING_INSIDE("textRingInside"),
-
- /**
- * Outside Ring Text Shape
- *
- */
- @XmlEnumValue("textRingOutside")
- TEXT_RING_OUTSIDE("textRingOutside"),
-
- /**
- * Upward Arch Text Shape
- *
- */
- @XmlEnumValue("textArchUp")
- TEXT_ARCH_UP("textArchUp"),
-
- /**
- * Downward Arch Text Shape
- *
- */
- @XmlEnumValue("textArchDown")
- TEXT_ARCH_DOWN("textArchDown"),
-
- /**
- * Circle Text Shape
- *
- */
- @XmlEnumValue("textCircle")
- TEXT_CIRCLE("textCircle"),
-
- /**
- * Button Text Shape
- *
- */
- @XmlEnumValue("textButton")
- TEXT_BUTTON("textButton"),
-
- /**
- * Upward Pour Arch Text Shape
- *
- */
- @XmlEnumValue("textArchUpPour")
- TEXT_ARCH_UP_POUR("textArchUpPour"),
-
- /**
- * Downward Pour Arch Text Shape
- *
- */
- @XmlEnumValue("textArchDownPour")
- TEXT_ARCH_DOWN_POUR("textArchDownPour"),
-
- /**
- * Circle Pour Text Shape
- *
- */
- @XmlEnumValue("textCirclePour")
- TEXT_CIRCLE_POUR("textCirclePour"),
-
- /**
- * Button Pour Text Shape
- *
- */
- @XmlEnumValue("textButtonPour")
- TEXT_BUTTON_POUR("textButtonPour"),
-
- /**
- * Upward Curve Text Shape
- *
- */
- @XmlEnumValue("textCurveUp")
- TEXT_CURVE_UP("textCurveUp"),
-
- /**
- * Downward Curve Text Shape
- *
- */
- @XmlEnumValue("textCurveDown")
- TEXT_CURVE_DOWN("textCurveDown"),
-
- /**
- * Upward Can Text Shape
- *
- */
- @XmlEnumValue("textCanUp")
- TEXT_CAN_UP("textCanUp"),
-
- /**
- * Downward Can Text Shape
- *
- */
- @XmlEnumValue("textCanDown")
- TEXT_CAN_DOWN("textCanDown"),
-
- /**
- * Wave 1 Text Shape
- *
- */
- @XmlEnumValue("textWave1")
- TEXT_WAVE_1("textWave1"),
-
- /**
- * Wave 2 Text Shape
- *
- */
- @XmlEnumValue("textWave2")
- TEXT_WAVE_2("textWave2"),
-
- /**
- * Double Wave 1 Text Shape
- *
- */
- @XmlEnumValue("textDoubleWave1")
- TEXT_DOUBLE_WAVE_1("textDoubleWave1"),
-
- /**
- * Wave 4 Text Shape
- *
- */
- @XmlEnumValue("textWave4")
- TEXT_WAVE_4("textWave4"),
-
- /**
- * Inflate Text Shape
- *
- */
- @XmlEnumValue("textInflate")
- TEXT_INFLATE("textInflate"),
-
- /**
- * Deflate Text Shape
- *
- */
- @XmlEnumValue("textDeflate")
- TEXT_DEFLATE("textDeflate"),
-
- /**
- * Bottom Inflate Text Shape
- *
- */
- @XmlEnumValue("textInflateBottom")
- TEXT_INFLATE_BOTTOM("textInflateBottom"),
-
- /**
- * Bottom Deflate Text Shape
- *
- */
- @XmlEnumValue("textDeflateBottom")
- TEXT_DEFLATE_BOTTOM("textDeflateBottom"),
-
- /**
- * Top Inflate Text Shape
- *
- */
- @XmlEnumValue("textInflateTop")
- TEXT_INFLATE_TOP("textInflateTop"),
-
- /**
- * Top Deflate Text Shape
- *
- */
- @XmlEnumValue("textDeflateTop")
- TEXT_DEFLATE_TOP("textDeflateTop"),
-
- /**
- * Deflate-Inflate Text Shape
- *
- */
- @XmlEnumValue("textDeflateInflate")
- TEXT_DEFLATE_INFLATE("textDeflateInflate"),
-
- /**
- * Deflate-Inflate-Deflate Text Shape
- *
- */
- @XmlEnumValue("textDeflateInflateDeflate")
- TEXT_DEFLATE_INFLATE_DEFLATE("textDeflateInflateDeflate"),
-
- /**
- * Right Fade Text Shape
- *
- */
- @XmlEnumValue("textFadeRight")
- TEXT_FADE_RIGHT("textFadeRight"),
-
- /**
- * Left Fade Text Shape
- *
- */
- @XmlEnumValue("textFadeLeft")
- TEXT_FADE_LEFT("textFadeLeft"),
-
- /**
- * Upward Fade Text Shape
- *
- */
- @XmlEnumValue("textFadeUp")
- TEXT_FADE_UP("textFadeUp"),
-
- /**
- * Downward Fade Text Shape
- *
- */
- @XmlEnumValue("textFadeDown")
- TEXT_FADE_DOWN("textFadeDown"),
-
- /**
- * Upward Slant Text Shape
- *
- */
- @XmlEnumValue("textSlantUp")
- TEXT_SLANT_UP("textSlantUp"),
-
- /**
- * Downward Slant Text Shape
- *
- */
- @XmlEnumValue("textSlantDown")
- TEXT_SLANT_DOWN("textSlantDown"),
-
- /**
- * Upward Cascade Text Shape
- *
- */
- @XmlEnumValue("textCascadeUp")
- TEXT_CASCADE_UP("textCascadeUp"),
-
- /**
- * Downward Cascade Text Shape
- *
- */
- @XmlEnumValue("textCascadeDown")
- TEXT_CASCADE_DOWN("textCascadeDown");
- private final String value;
-
- STTextShapeType(String v) {
- value = v;
- }
-
- public String value() {
- return value;
- }
-
- public static STTextShapeType fromValue(String v) {
- for (STTextShapeType c: STTextShapeType.values()) {
- if (c.value.equals(v)) {
- return c;
- }
- }
- throw new IllegalArgumentException(v);
- }
-
-}
diff --git a/src/java/org/apache/poi/sl/draw/binding/package-info.java b/src/java/org/apache/poi/sl/draw/binding/package-info.java
deleted file mode 100644
index 6c817337e1..0000000000
--- a/src/java/org/apache/poi/sl/draw/binding/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/* ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-==================================================================== */
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.apache.poi.sl.draw.binding;
diff --git a/src/java/org/apache/poi/sl/draw/geom/AdjustHandle.java b/src/java/org/apache/poi/sl/draw/geom/AdjustHandle.java
new file mode 100644
index 0000000000..a101c167a1
--- /dev/null
+++ b/src/java/org/apache/poi/sl/draw/geom/AdjustHandle.java
@@ -0,0 +1,23 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+
+package org.apache.poi.sl.draw.geom;
+
+public interface AdjustHandle {
+}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTAdjPoint2D.java b/src/java/org/apache/poi/sl/draw/geom/AdjustPoint.java
index a555089ea2..27c5e09a7f 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTAdjPoint2D.java
+++ b/src/java/org/apache/poi/sl/draw/geom/AdjustPoint.java
@@ -15,19 +15,15 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
+package org.apache.poi.sl.draw.geom;
+import java.util.Objects;
/**
* <p>Java class for CT_AdjPoint2D complex type.
- *
+ *
* <p>The following schema fragment specifies the expected content contained within this class.
- *
+ *
* <pre>
* &lt;complexType name="CT_AdjPoint2D"&gt;
* &lt;complexContent&gt;
@@ -38,25 +34,26 @@ import javax.xml.bind.annotation.XmlType;
* &lt;/complexContent&gt;
* &lt;/complexType&gt;
* </pre>
- *
- *
+ *
+ *
*/
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_AdjPoint2D")
-public class CTAdjPoint2D {
+// @XmlAccessorType(XmlAccessType.FIELD)
+// @XmlType(name = "CT_AdjPoint2D")
+public class AdjustPoint {
+
+ // @XmlAttribute(name = "x", required = true)
+ private String x;
+ // @XmlAttribute(name = "y", required = true)
+ private String y;
- @XmlAttribute(name = "x", required = true)
- protected String x;
- @XmlAttribute(name = "y", required = true)
- protected String y;
/**
* Gets the value of the x property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getX() {
return x;
@@ -64,11 +61,11 @@ public class CTAdjPoint2D {
/**
* Sets the value of the x property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setX(String value) {
this.x = value;
@@ -80,11 +77,11 @@ public class CTAdjPoint2D {
/**
* Gets the value of the y property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getY() {
return y;
@@ -92,11 +89,11 @@ public class CTAdjPoint2D {
/**
* Sets the value of the y property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setY(String value) {
this.y = value;
@@ -106,4 +103,17 @@ public class CTAdjPoint2D {
return (this.y!= null);
}
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof AdjustPoint)) return false;
+ AdjustPoint that = (AdjustPoint) o;
+ return Objects.equals(x, that.x) &&
+ Objects.equals(y, that.y);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(x, y);
+ }
}
diff --git a/src/java/org/apache/poi/sl/draw/geom/AdjustValue.java b/src/java/org/apache/poi/sl/draw/geom/AdjustValue.java
index 4fc07d22fe..68570b1599 100644
--- a/src/java/org/apache/poi/sl/draw/geom/AdjustValue.java
+++ b/src/java/org/apache/poi/sl/draw/geom/AdjustValue.java
@@ -19,17 +19,11 @@
package org.apache.poi.sl.draw.geom;
-import org.apache.poi.sl.draw.binding.CTGeomGuide;
-
/**
* Represents a shape adjust values (see section 20.1.9.5 in the spec)
*/
public class AdjustValue extends Guide {
- public AdjustValue(CTGeomGuide gd) {
- super(gd.getName(), gd.getFmla());
- }
-
@Override
public double evaluate(Context ctx){
String name = getName();
diff --git a/src/java/org/apache/poi/sl/draw/geom/ArcToCommand.java b/src/java/org/apache/poi/sl/draw/geom/ArcToCommand.java
index 9ff57e6da9..4c6c14d09b 100644
--- a/src/java/org/apache/poi/sl/draw/geom/ArcToCommand.java
+++ b/src/java/org/apache/poi/sl/draw/geom/ArcToCommand.java
@@ -24,28 +24,64 @@ import static org.apache.poi.sl.draw.geom.Formula.OOXML_DEGREE;
import java.awt.geom.Arc2D;
import java.awt.geom.Path2D;
import java.awt.geom.Point2D;
+import java.util.Objects;
-import org.apache.poi.sl.draw.binding.CTPath2DArcTo;
import org.apache.poi.util.Internal;
/**
* ArcTo command within a shape path in DrawingML:
- * {@code &lt;arcTo wR="wr" hR="hr" stAng="stAng" swAng="swAng"/&gt;}<p>
- *
- * Where {@code wr} and {@code wh} are the height and width radiuses
+ * {@code &lt;arcTo wR="wr" hR="hr" stAng="stAng" swAng="swAng"/&gt;}
+ * <p>
+ * Where {@code wr} and {@code wh} are the height and width radii
* of the supposed circle being used to draw the arc. This gives the circle
* a total height of (2 * hR) and a total width of (2 * wR)
- *
+ * <p>
* stAng is the {@code start} angle and {@code swAng} is the swing angle
+ * <p>
+ * Java class for CT_Path2DArcTo complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * &lt;complexType name="CT_Path2DArcTo"&gt;
+ * &lt;complexContent&gt;
+ * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ * &lt;attribute name="wR" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate" /&gt;
+ * &lt;attribute name="hR" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate" /&gt;
+ * &lt;attribute name="stAng" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjAngle" /&gt;
+ * &lt;attribute name="swAng" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjAngle" /&gt;
+ * &lt;/restriction&gt;
+ * &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * </pre>
*/
+// @XmlAccessorType(XmlAccessType.FIELD)
+// @XmlType(name = "CT_Path2DArcTo")
public class ArcToCommand implements PathCommand {
- private String hr, wr, stAng, swAng;
- ArcToCommand(CTPath2DArcTo arc){
- hr = arc.getHR();
- wr = arc.getWR();
- stAng = arc.getStAng();
- swAng = arc.getSwAng();
+ // @XmlAttribute(name = "wR", required = true)
+ private String wr;
+ // @XmlAttribute(name = "hR", required = true)
+ private String hr;
+ // @XmlAttribute(name = "stAng", required = true)
+ private String stAng;
+ // @XmlAttribute(name = "swAng", required = true)
+ private String swAng;
+
+ public void setHR(String hr) {
+ this.hr = hr;
+ }
+
+ public void setWR(String wr) {
+ this.wr = wr;
+ }
+
+ public void setStAng(String stAng) {
+ this.stAng = stAng;
+ }
+
+ public void setSwAng(String swAng) {
+ this.swAng = swAng;
}
@Override
@@ -141,4 +177,21 @@ public class ArcToCommand implements PathCommand {
awtAngle = Math.toDegrees(Math.atan2(Math.tan(Math.toRadians(awtAngle2)), aspect)) + awtAngle3;
return awtAngle;
}
+
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof ArcToCommand)) return false;
+ ArcToCommand that = (ArcToCommand) o;
+ return Objects.equals(wr, that.wr) &&
+ Objects.equals(hr, that.hr) &&
+ Objects.equals(stAng, that.stAng) &&
+ Objects.equals(swAng, that.swAng);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(wr, hr, stAng, swAng);
+ }
}
diff --git a/src/java/org/apache/poi/sl/draw/geom/ClosePathCommand.java b/src/java/org/apache/poi/sl/draw/geom/ClosePathCommand.java
index 580839cb57..ab7a37a444 100644
--- a/src/java/org/apache/poi/sl/draw/geom/ClosePathCommand.java
+++ b/src/java/org/apache/poi/sl/draw/geom/ClosePathCommand.java
@@ -21,13 +21,39 @@ package org.apache.poi.sl.draw.geom;
import java.awt.geom.Path2D;
+/**
+ * <p>Java class for CT_Path2DClose complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * &lt;complexType name="CT_Path2DClose"&gt;
+ * &lt;complexContent&gt;
+ * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ * &lt;/restriction&gt;
+ * &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * </pre>
+ *
+ *
+ */
+// @XmlAccessorType(XmlAccessType.FIELD)
+// @XmlType(name = "CT_Path2DClose")
public class ClosePathCommand implements PathCommand {
- ClosePathCommand(){
- }
-
@Override
public void execute(Path2D.Double path, Context ctx){
path.closePath();
}
+
+
+ @Override
+ public int hashCode() {
+ return 0xC105E;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ return (obj instanceof ClosePathCommand);
+ }
}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTConnectionSite.java b/src/java/org/apache/poi/sl/draw/geom/ConnectionSite.java
index 1abe8bab7c..9f19ebccc6 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTConnectionSite.java
+++ b/src/java/org/apache/poi/sl/draw/geom/ConnectionSite.java
@@ -15,20 +15,15 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+package org.apache.poi.sl.draw.geom;
+import java.util.Objects;
/**
* <p>Java class for CT_ConnectionSite complex type.
- *
+ *
* <p>The following schema fragment specifies the expected content contained within this class.
- *
+ *
* <pre>
* &lt;complexType name="CT_ConnectionSite"&gt;
* &lt;complexContent&gt;
@@ -41,55 +36,52 @@ import javax.xml.bind.annotation.XmlType;
* &lt;/complexContent&gt;
* &lt;/complexType&gt;
* </pre>
- *
- *
+ *
+ *
*/
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_ConnectionSite", propOrder = {
- "pos"
-})
-public class CTConnectionSite {
+// @XmlAccessorType(XmlAccessType.FIELD)
+// @XmlType(name = "CT_ConnectionSite", propOrder = {"pos"})
+public final class ConnectionSite {
- @XmlElement(required = true)
- protected CTAdjPoint2D pos;
- @XmlAttribute(name = "ang", required = true)
- protected String ang;
+ // @XmlElement(required = true)
+ private final AdjustPoint pos = new AdjustPoint();
+ // @XmlAttribute(name = "ang", required = true)
+ private String ang;
/**
* Gets the value of the pos property.
- *
+ *
* @return
* possible object is
- * {@link CTAdjPoint2D }
- *
+ * {@link AdjustPoint }
+ *
*/
- public CTAdjPoint2D getPos() {
+ public AdjustPoint getPos() {
return pos;
}
/**
* Sets the value of the pos property.
- *
- * @param value
+ *
+ * @param pos
* allowed object is
- * {@link CTAdjPoint2D }
- *
+ * {@link AdjustPoint }
+ *
*/
- public void setPos(CTAdjPoint2D value) {
- this.pos = value;
- }
-
- public boolean isSetPos() {
- return (this.pos!= null);
+ public void setPos(AdjustPoint pos) {
+ if (pos != null) {
+ this.pos.setX(pos.getX());
+ this.pos.setY(pos.getY());
+ }
}
/**
* Gets the value of the ang property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getAng() {
return ang;
@@ -97,11 +89,11 @@ public class CTConnectionSite {
/**
* Sets the value of the ang property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setAng(String value) {
this.ang = value;
@@ -111,4 +103,17 @@ public class CTConnectionSite {
return (this.ang!= null);
}
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof ConnectionSite)) return false;
+ ConnectionSite that = (ConnectionSite) o;
+ return Objects.equals(pos, that.pos) &&
+ Objects.equals(ang, that.ang);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(pos, ang);
+ }
}
diff --git a/src/java/org/apache/poi/sl/draw/geom/CurveToCommand.java b/src/java/org/apache/poi/sl/draw/geom/CurveToCommand.java
index 92fb4c52f9..2e121c7893 100644
--- a/src/java/org/apache/poi/sl/draw/geom/CurveToCommand.java
+++ b/src/java/org/apache/poi/sl/draw/geom/CurveToCommand.java
@@ -20,29 +20,82 @@
package org.apache.poi.sl.draw.geom;
import java.awt.geom.Path2D;
+import java.util.Objects;
-import org.apache.poi.sl.draw.binding.CTAdjPoint2D;
+/**
+ * <p>Java class for CT_Path2DCubicBezierTo complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * &lt;complexType name="CT_Path2DCubicBezierTo"&gt;
+ * &lt;complexContent&gt;
+ * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ * &lt;sequence&gt;
+ * &lt;element name="pt" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_AdjPoint2D" maxOccurs="3" minOccurs="3"/&gt;
+ * &lt;/sequence&gt;
+ * &lt;/restriction&gt;
+ * &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * </pre>
+ *
+ *
+ */
+// @XmlAccessorType(XmlAccessType.FIELD)
+// @XmlType(name = "CT_Path2DCubicBezierTo", propOrder = {"pt"})
+public final class CurveToCommand implements PathCommand {
+
+ // @XmlElement(required = true)
+ private final AdjustPoint pt1 = new AdjustPoint();
+ // @XmlElement(required = true)
+ private final AdjustPoint pt2 = new AdjustPoint();
+ // @XmlElement(required = true)
+ private final AdjustPoint pt3 = new AdjustPoint();
-public class CurveToCommand implements PathCommand {
- private String arg1, arg2, arg3, arg4, arg5, arg6;
+ public void setPt1(AdjustPoint pt1) {
+ if (pt1 != null) {
+ this.pt1.setX(pt1.getX());
+ this.pt1.setY(pt1.getY());
+ }
+ }
- CurveToCommand(CTAdjPoint2D pt1, CTAdjPoint2D pt2, CTAdjPoint2D pt3){
- arg1 = pt1.getX();
- arg2 = pt1.getY();
- arg3 = pt2.getX();
- arg4 = pt2.getY();
- arg5 = pt3.getX();
- arg6 = pt3.getY();
+ public void setPt2(AdjustPoint pt2) {
+ if (pt2 != null) {
+ this.pt2.setX(pt2.getX());
+ this.pt2.setY(pt2.getY());
+ }
+ }
+
+ public void setPt3(AdjustPoint pt3) {
+ if (pt3 != null) {
+ this.pt3.setX(pt3.getX());
+ this.pt3.setY(pt3.getY());
+ }
}
@Override
public void execute(Path2D.Double path, Context ctx){
- double x1 = ctx.getValue(arg1);
- double y1 = ctx.getValue(arg2);
- double x2 = ctx.getValue(arg3);
- double y2 = ctx.getValue(arg4);
- double x3 = ctx.getValue(arg5);
- double y3 = ctx.getValue(arg6);
+ double x1 = ctx.getValue(pt1.getX());
+ double y1 = ctx.getValue(pt1.getY());
+ double x2 = ctx.getValue(pt2.getX());
+ double y2 = ctx.getValue(pt2.getY());
+ double x3 = ctx.getValue(pt3.getX());
+ double y3 = ctx.getValue(pt3.getY());
path.curveTo(x1, y1, x2, y2, x3, y3);
}
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof CurveToCommand)) return false;
+ CurveToCommand that = (CurveToCommand) o;
+ return Objects.equals(pt1, that.pt1) &&
+ Objects.equals(pt2, that.pt2) &&
+ Objects.equals(pt3, that.pt3);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(pt1, pt2, pt3);
+ }
}
diff --git a/src/java/org/apache/poi/sl/draw/geom/CustomGeometry.java b/src/java/org/apache/poi/sl/draw/geom/CustomGeometry.java
index 2be58130a5..ff7a1c2f5f 100644
--- a/src/java/org/apache/poi/sl/draw/geom/CustomGeometry.java
+++ b/src/java/org/apache/poi/sl/draw/geom/CustomGeometry.java
@@ -22,56 +22,89 @@ package org.apache.poi.sl.draw.geom;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-
-import org.apache.poi.sl.draw.binding.CTCustomGeometry2D;
-import org.apache.poi.sl.draw.binding.CTGeomGuide;
-import org.apache.poi.sl.draw.binding.CTGeomGuideList;
-import org.apache.poi.sl.draw.binding.CTGeomRect;
-import org.apache.poi.sl.draw.binding.CTPath2D;
-import org.apache.poi.sl.draw.binding.CTPath2DList;
+import java.util.Objects;
/**
* Definition of a custom geometric shape
+ *
+ *
+ * <p>Java class for CT_CustomGeometry2D complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * &lt;complexType name="CT_CustomGeometry2D"&gt;
+ * &lt;complexContent&gt;
+ * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ * &lt;sequence&gt;
+ * &lt;element name="avLst" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_GeomGuideList" minOccurs="0"/&gt;
+ * &lt;element name="gdLst" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_GeomGuideList" minOccurs="0"/&gt;
+ * &lt;element name="ahLst" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_AdjustHandleList" minOccurs="0"/&gt;
+ * &lt;element name="cxnLst" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_ConnectionSiteList" minOccurs="0"/&gt;
+ * &lt;element name="rect" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_GeomRect" minOccurs="0"/&gt;
+ * &lt;element name="pathLst" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DList"/&gt;
+ * &lt;/sequence&gt;
+ * &lt;/restriction&gt;
+ * &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * </pre>
*/
-public class CustomGeometry implements Iterable<Path>{
- final List<Guide> adjusts = new ArrayList<>();
+public final class CustomGeometry implements Iterable<Path>{
+ final List<AdjustValue> adjusts = new ArrayList<>();
final List<Guide> guides = new ArrayList<>();
final List<Path> paths = new ArrayList<>();
+ final List<AdjustHandle> handles = new ArrayList<>();
+ final List<ConnectionSite> connections = new ArrayList<>();
Path textBounds;
- public CustomGeometry(CTCustomGeometry2D geom) {
- CTGeomGuideList avLst = geom.getAvLst();
- if(avLst != null) {
- for(CTGeomGuide gd : avLst.getGd()){
- adjusts.add(new AdjustValue(gd));
- }
- }
-
- CTGeomGuideList gdLst = geom.getGdLst();
- if(gdLst != null) {
- for(CTGeomGuide gd : gdLst.getGd()){
- guides.add(new Guide(gd));
- }
- }
-
- CTPath2DList pathLst = geom.getPathLst();
- if(pathLst != null) {
- for(CTPath2D spPath : pathLst.getPath()){
- paths.add(new Path(spPath));
- }
- }
-
- CTGeomRect rect = geom.getRect();
- if(rect != null) {
- textBounds = new Path();
- textBounds.addCommand(new MoveToCommand(rect.getL(), rect.getT()));
- textBounds.addCommand(new LineToCommand(rect.getR(), rect.getT()));
- textBounds.addCommand(new LineToCommand(rect.getR(), rect.getB()));
- textBounds.addCommand(new LineToCommand(rect.getL(), rect.getB()));
- textBounds.addCommand(new ClosePathCommand());
- }
+ public void addAdjustGuide(AdjustValue guide) {
+ adjusts.add(guide);
+ }
+
+ public void addGeomGuide(Guide guide) {
+ guides.add(guide);
}
+ public void addAdjustHandle(AdjustHandle handle) {
+ handles.add(handle);
+ }
+
+ public void addConnectionSite(ConnectionSite connection) {
+ connections.add(connection);
+ }
+
+ public void addPath(Path path) {
+ paths.add(path);
+ }
+
+ public void setTextBounds(String left, String top, String right, String bottom) {
+ textBounds = new Path();
+ textBounds.addCommand(moveTo(left,top));
+ textBounds.addCommand(lineTo(right, top));
+ textBounds.addCommand(lineTo(right, bottom));
+ textBounds.addCommand(lineTo(left, bottom));
+ textBounds.addCommand(new ClosePathCommand());
+ }
+
+ private static MoveToCommand moveTo(String x, String y) {
+ AdjustPoint pt = new AdjustPoint();
+ pt.setX(x);
+ pt.setY(y);
+ MoveToCommand cmd = new MoveToCommand();
+ cmd.setPt(pt);
+ return cmd;
+ }
+
+ private static LineToCommand lineTo(String x, String y) {
+ AdjustPoint pt = new AdjustPoint();
+ pt.setX(x);
+ pt.setY(y);
+ LineToCommand cmd = new LineToCommand();
+ cmd.setPt(pt);
+ return cmd;
+ }
+
+
@Override
public Iterator<Path> iterator() {
return paths.iterator();
@@ -80,4 +113,23 @@ public class CustomGeometry implements Iterable<Path>{
public Path getTextBounds(){
return textBounds;
}
+
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof CustomGeometry)) return false;
+ CustomGeometry that = (CustomGeometry) o;
+ return Objects.equals(adjusts, that.adjusts) &&
+ Objects.equals(guides, that.guides) &&
+ Objects.equals(handles, that.handles) &&
+ Objects.equals(connections, that.connections) &&
+ Objects.equals(textBounds, that.textBounds) &&
+ Objects.equals(paths, that.paths);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(adjusts, guides, handles, connections, textBounds, paths);
+ }
}
diff --git a/src/java/org/apache/poi/sl/draw/geom/Guide.java b/src/java/org/apache/poi/sl/draw/geom/Guide.java
index 323bca07d0..77da392058 100644
--- a/src/java/org/apache/poi/sl/draw/geom/Guide.java
+++ b/src/java/org/apache/poi/sl/draw/geom/Guide.java
@@ -21,13 +21,29 @@ package org.apache.poi.sl.draw.geom;
import static java.lang.Math.*;
+import java.util.Objects;
import java.util.regex.Pattern;
-import org.apache.poi.sl.draw.binding.CTGeomGuide;
-
/**
- * A simple pattern parser of shape guide formulas in DrawingML
+ * <p>Java class for CT_GeomGuide complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * &lt;complexType name="CT_GeomGuide"&gt;
+ * &lt;complexContent&gt;
+ * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ * &lt;attribute name="name" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_GeomGuideName" /&gt;
+ * &lt;attribute name="fmla" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_GeomGuideFormula" /&gt;
+ * &lt;/restriction&gt;
+ * &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * </pre>
+ *
+ *
*/
+// @XmlAccessorType(XmlAccessType.FIELD)
+// @XmlType(name = "CT_GeomGuide")
public class Guide implements Formula {
enum Op {
muldiv,addsub,adddiv,ifelse,val,abs,sqrt,max,min,at2,sin,cos,tan,cat2,sat2,pin,mod
@@ -35,20 +51,30 @@ public class Guide implements Formula {
private static final Pattern WHITESPACE = Pattern.compile("\\s+");
- @SuppressWarnings({"FieldCanBeLocal", "unused"})
- private final String name, fmla;
- private final Op op;
- private final String[] operands;
+ // @XmlAttribute(name = "name", required = true)
+ // @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+ private String name;
+ // @XmlAttribute(name = "fmla", required = true)
+ private String fmla;
+
+ private Op op;
+ private String[] operands;
+ public String getName(){
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
- public Guide(CTGeomGuide gd) {
- this(gd.getName(), gd.getFmla());
+ public String getFmla() {
+ return fmla;
}
- public Guide(String nm, String fm){
- name = nm;
- fmla = fm;
- operands = WHITESPACE.split(fm);
+ public void setFmla(String fmla) {
+ this.fmla = fmla;
+ operands = WHITESPACE.split(fmla);
switch (operands[0]) {
case "*/": op = Op.muldiv; break;
case "+-": op = Op.addsub; break;
@@ -58,10 +84,6 @@ public class Guide implements Formula {
}
}
- public String getName(){
- return name;
- }
-
@Override
public double evaluate(Context ctx) {
double x = (operands.length > 1) ? ctx.getValue(operands[1]) : 0;
@@ -126,4 +148,18 @@ public class Guide implements Formula {
return 0;
}
}
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ Guide guide = (Guide) o;
+ return Objects.equals(name, guide.name) &&
+ Objects.equals(fmla, guide.fmla);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(name, fmla);
+ }
}
diff --git a/src/java/org/apache/poi/sl/draw/geom/LineToCommand.java b/src/java/org/apache/poi/sl/draw/geom/LineToCommand.java
index bcd0b91c70..b1965fab87 100644
--- a/src/java/org/apache/poi/sl/draw/geom/LineToCommand.java
+++ b/src/java/org/apache/poi/sl/draw/geom/LineToCommand.java
@@ -20,26 +20,63 @@
package org.apache.poi.sl.draw.geom;
import java.awt.geom.Path2D;
+import java.util.Objects;
-import org.apache.poi.sl.draw.binding.CTAdjPoint2D;
+/**
+ * <p>Java class for CT_Path2DLineTo complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * &lt;complexType name="CT_Path2DLineTo"&gt;
+ * &lt;complexContent&gt;
+ * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ * &lt;sequence&gt;
+ * &lt;element name="pt" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_AdjPoint2D"/&gt;
+ * &lt;/sequence&gt;
+ * &lt;/restriction&gt;
+ * &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * </pre>
+ *
+ *
+ */
+// @XmlAccessorType(XmlAccessType.FIELD)
+// @XmlType(name = "CT_Path2DLineTo", propOrder = {"pt"})
+public final class LineToCommand implements PathCommand {
-public class LineToCommand implements PathCommand {
- private String arg1, arg2;
+ // @XmlElement(required = true)
+ private final AdjustPoint pt = new AdjustPoint();
- LineToCommand(CTAdjPoint2D pt){
- arg1 = pt.getX();
- arg2 = pt.getY();
+ public AdjustPoint getPt() {
+ return pt;
}
- LineToCommand(String s1, String s2){
- arg1 = s1;
- arg2 = s2;
+ public void setPt(AdjustPoint pt) {
+ if (pt != null) {
+ this.pt.setX(pt.getX());
+ this.pt.setY(pt.getY());
+ }
}
@Override
public void execute(Path2D.Double path, Context ctx){
- double x = ctx.getValue(arg1);
- double y = ctx.getValue(arg2);
+ double x = ctx.getValue(pt.getX());
+ double y = ctx.getValue(pt.getY());
path.lineTo(x, y);
}
+
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof LineToCommand)) return false;
+ LineToCommand that = (LineToCommand) o;
+ return Objects.equals(pt, that.pt);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(pt);
+ }
}
diff --git a/src/java/org/apache/poi/sl/draw/geom/MoveToCommand.java b/src/java/org/apache/poi/sl/draw/geom/MoveToCommand.java
index 331356ae78..6ebaa206b3 100644
--- a/src/java/org/apache/poi/sl/draw/geom/MoveToCommand.java
+++ b/src/java/org/apache/poi/sl/draw/geom/MoveToCommand.java
@@ -20,26 +20,63 @@
package org.apache.poi.sl.draw.geom;
import java.awt.geom.Path2D;
+import java.util.Objects;
-import org.apache.poi.sl.draw.binding.CTAdjPoint2D;
+/**
+ * <p>Java class for CT_Path2DMoveTo complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * &lt;complexType name="CT_Path2DMoveTo"&gt;
+ * &lt;complexContent&gt;
+ * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ * &lt;sequence&gt;
+ * &lt;element name="pt" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_AdjPoint2D"/&gt;
+ * &lt;/sequence&gt;
+ * &lt;/restriction&gt;
+ * &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * </pre>
+ *
+ *
+ */
+// @XmlAccessorType(XmlAccessType.FIELD)
+// @XmlType(name = "CT_Path2DMoveTo", propOrder = {"pt"})
+public final class MoveToCommand implements PathCommand {
-public class MoveToCommand implements PathCommand {
- private String arg1, arg2;
+ // @XmlElement(required = true)
+ private final AdjustPoint pt = new AdjustPoint();
- MoveToCommand(CTAdjPoint2D pt){
- arg1 = pt.getX();
- arg2 = pt.getY();
+ public AdjustPoint getPt() {
+ return pt;
}
- MoveToCommand(String s1, String s2){
- arg1 = s1;
- arg2 = s2;
+ public void setPt(AdjustPoint pt) {
+ if (pt != null) {
+ this.pt.setX(pt.getX());
+ this.pt.setY(pt.getY());
+ }
}
@Override
public void execute(Path2D.Double path, Context ctx){
- double x = ctx.getValue(arg1);
- double y = ctx.getValue(arg2);
+ double x = ctx.getValue(pt.getX());
+ double y = ctx.getValue(pt.getY());
path.moveTo(x, y);
}
+
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof MoveToCommand)) return false;
+ MoveToCommand that = (MoveToCommand) o;
+ return Objects.equals(pt, that.pt);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(pt);
+ }
}
diff --git a/src/java/org/apache/poi/sl/draw/geom/Path.java b/src/java/org/apache/poi/sl/draw/geom/Path.java
index 07ec9f861f..2d86f4747d 100644
--- a/src/java/org/apache/poi/sl/draw/geom/Path.java
+++ b/src/java/org/apache/poi/sl/draw/geom/Path.java
@@ -22,84 +22,65 @@ package org.apache.poi.sl.draw.geom;
import java.awt.geom.Path2D;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
-import org.apache.poi.sl.draw.binding.CTAdjPoint2D;
-import org.apache.poi.sl.draw.binding.CTPath2D;
-import org.apache.poi.sl.draw.binding.CTPath2DArcTo;
-import org.apache.poi.sl.draw.binding.CTPath2DClose;
-import org.apache.poi.sl.draw.binding.CTPath2DCubicBezierTo;
-import org.apache.poi.sl.draw.binding.CTPath2DLineTo;
-import org.apache.poi.sl.draw.binding.CTPath2DMoveTo;
-import org.apache.poi.sl.draw.binding.CTPath2DQuadBezierTo;
import org.apache.poi.sl.usermodel.PaintStyle.PaintModifier;
/**
* Specifies a creation path consisting of a series of moves, lines and curves
* that when combined forms a geometric shape
+ *
+ * <p>Java class for CT_Path2D complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * &lt;complexType name="CT_Path2D"&gt;
+ * &lt;complexContent&gt;
+ * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ * &lt;choice maxOccurs="unbounded" minOccurs="0"&gt;
+ * &lt;element name="close" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DClose"/&gt;
+ * &lt;element name="moveTo" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DMoveTo"/&gt;
+ * &lt;element name="lnTo" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DLineTo"/&gt;
+ * &lt;element name="arcTo" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DArcTo"/&gt;
+ * &lt;element name="quadBezTo" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DQuadBezierTo"/&gt;
+ * &lt;element name="cubicBezTo" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DCubicBezierTo"/&gt;
+ * &lt;/choice&gt;
+ * &lt;attribute name="w" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveCoordinate" default="0" /&gt;
+ * &lt;attribute name="h" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveCoordinate" default="0" /&gt;
+ * &lt;attribute name="fill" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PathFillMode" default="norm" /&gt;
+ * &lt;attribute name="stroke" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&gt;
+ * &lt;attribute name="extrusionOk" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&gt;
+ * &lt;/restriction&gt;
+ * &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * </pre>
*/
-public class Path {
-
- private final List<PathCommand> commands;
- PaintModifier _fill;
- boolean _stroke;
- long _w, _h;
+// @XmlAccessorType(XmlAccessType.FIELD)
+// @XmlType(name = "CT_Path2D", propOrder = {"closeOrMoveToOrLnTo"})
+public final class Path {
+
+ // @XmlElements({
+ // @XmlElement(name = "close", type = CTPath2DClose.class),
+ // @XmlElement(name = "moveTo", type = CTPath2DMoveTo.class),
+ // @XmlElement(name = "lnTo", type = CTPath2DLineTo.class),
+ // @XmlElement(name = "arcTo", type = CTPath2DArcTo.class),
+ // @XmlElement(name = "quadBezTo", type = CTPath2DQuadBezierTo.class),
+ // @XmlElement(name = "cubicBezTo", type = CTPath2DCubicBezierTo.class)
+ // })
+ private final List<PathCommand> commands = new ArrayList<>();
+ // @XmlAttribute(name = "fill")
+ private PaintModifier fill = PaintModifier.NORM;
+ // @XmlAttribute(name = "stroke")
+ private boolean stroke = true;
+ // @XmlAttribute(name = "extrusionOk")
+ private boolean extrusionOk = false;
+ // @XmlAttribute(name = "w")
+ private long w = -1;
+ // @XmlAttribute(name = "h")
+ private long h = -1;
- public Path(){
- this(true, true);
- }
-
- public Path(boolean fill, boolean stroke){
- commands = new ArrayList<>();
- _w = -1;
- _h = -1;
- _fill = (fill) ? PaintModifier.NORM : PaintModifier.NONE;
- _stroke = stroke;
- }
- public Path(CTPath2D spPath){
- switch (spPath.getFill()) {
- case NONE: _fill = PaintModifier.NONE; break;
- case DARKEN: _fill = PaintModifier.DARKEN; break;
- case DARKEN_LESS: _fill = PaintModifier.DARKEN_LESS; break;
- case LIGHTEN: _fill = PaintModifier.LIGHTEN; break;
- case LIGHTEN_LESS: _fill = PaintModifier.LIGHTEN_LESS; break;
- default:
- case NORM: _fill = PaintModifier.NORM; break;
- }
- _stroke = spPath.isStroke();
- _w = spPath.isSetW() ? spPath.getW() : -1;
- _h = spPath.isSetH() ? spPath.getH() : -1;
-
- commands = new ArrayList<>();
-
- for(Object ch : spPath.getCloseOrMoveToOrLnTo()){
- if(ch instanceof CTPath2DMoveTo){
- CTAdjPoint2D pt = ((CTPath2DMoveTo)ch).getPt();
- commands.add(new MoveToCommand(pt));
- } else if (ch instanceof CTPath2DLineTo){
- CTAdjPoint2D pt = ((CTPath2DLineTo)ch).getPt();
- commands.add(new LineToCommand(pt));
- } else if (ch instanceof CTPath2DArcTo){
- CTPath2DArcTo arc = (CTPath2DArcTo)ch;
- commands.add(new ArcToCommand(arc));
- } else if (ch instanceof CTPath2DQuadBezierTo){
- CTPath2DQuadBezierTo bez = ((CTPath2DQuadBezierTo)ch);
- CTAdjPoint2D pt1 = bez.getPt().get(0);
- CTAdjPoint2D pt2 = bez.getPt().get(1);
- commands.add(new QuadToCommand(pt1, pt2));
- } else if (ch instanceof CTPath2DCubicBezierTo){
- CTPath2DCubicBezierTo bez = ((CTPath2DCubicBezierTo)ch);
- CTAdjPoint2D pt1 = bez.getPt().get(0);
- CTAdjPoint2D pt2 = bez.getPt().get(1);
- CTAdjPoint2D pt3 = bez.getPt().get(2);
- commands.add(new CurveToCommand(pt1, pt2, pt3));
- } else if (ch instanceof CTPath2DClose){
- commands.add(new ClosePathCommand());
- } else {
- throw new IllegalStateException("Unsupported path segment: " + ch);
- }
- }
- }
public void addCommand(PathCommand cmd){
commands.add(cmd);
@@ -117,22 +98,65 @@ public class Path {
}
public boolean isStroked(){
- return _stroke;
+ return stroke;
+ }
+
+ public void setStroke(boolean stroke) {
+ this.stroke = stroke;
}
public boolean isFilled(){
- return _fill != PaintModifier.NONE;
+ return fill != PaintModifier.NONE;
}
public PaintModifier getFill() {
- return _fill;
+ return fill;
+ }
+
+ public void setFill(PaintModifier fill) {
+ this.fill = fill;
}
public long getW(){
- return _w;
+ return w;
+ }
+
+ public void setW(long w) {
+ this.w = w;
}
public long getH(){
- return _h;
+ return h;
+ }
+
+ public void setH(long h) {
+ this.h = h;
+ }
+
+ public boolean isExtrusionOk() {
+ return extrusionOk;
+ }
+
+ public void setExtrusionOk(boolean extrusionOk) {
+ this.extrusionOk = extrusionOk;
+ }
+
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof Path)) return false;
+ Path ctPath2D = (Path) o;
+ return Objects.equals(commands, ctPath2D.commands) &&
+ Objects.equals(w, ctPath2D.w) &&
+ Objects.equals(h, ctPath2D.h) &&
+ fill == ctPath2D.fill &&
+ Objects.equals(stroke, ctPath2D.stroke) &&
+ Objects.equals(extrusionOk, ctPath2D.extrusionOk);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(commands, w, h, fill.ordinal(), stroke, extrusionOk);
}
}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTPolarAdjustHandle.java b/src/java/org/apache/poi/sl/draw/geom/PolarAdjustHandle.java
index e173df1efe..97ca9afa97 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTPolarAdjustHandle.java
+++ b/src/java/org/apache/poi/sl/draw/geom/PolarAdjustHandle.java
@@ -15,22 +15,15 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+package org.apache.poi.sl.draw.geom;
+import java.util.Objects;
/**
* <p>Java class for CT_PolarAdjustHandle complex type.
- *
+ *
* <p>The following schema fragment specifies the expected content contained within this class.
- *
+ *
* <pre>
* &lt;complexType name="CT_PolarAdjustHandle"&gt;
* &lt;complexContent&gt;
@@ -48,53 +41,51 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
* &lt;/complexContent&gt;
* &lt;/complexType&gt;
* </pre>
- *
- *
+ *
+ *
*/
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_PolarAdjustHandle", propOrder = {
- "pos"
-})
-public class CTPolarAdjustHandle {
+// @XmlAccessorType(XmlAccessType.FIELD)
+// @XmlType(name = "CT_PolarAdjustHandle", propOrder = {"pos"})
+public final class PolarAdjustHandle implements AdjustHandle {
- @XmlElement(required = true)
- protected CTAdjPoint2D pos;
- @XmlAttribute(name = "gdRefR")
- @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
- protected String gdRefR;
- @XmlAttribute(name = "minR")
- protected String minR;
- @XmlAttribute(name = "maxR")
- protected String maxR;
- @XmlAttribute(name = "gdRefAng")
- @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
- protected String gdRefAng;
- @XmlAttribute(name = "minAng")
- protected String minAng;
- @XmlAttribute(name = "maxAng")
- protected String maxAng;
+ // @XmlElement(required = true)
+ private AdjustPoint pos;
+ // @XmlAttribute(name = "gdRefR")
+ // @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+ private String gdRefR;
+ // @XmlAttribute(name = "minR")
+ private String minR;
+ // @XmlAttribute(name = "maxR")
+ private String maxR;
+ // @XmlAttribute(name = "gdRefAng")
+ // @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+ private String gdRefAng;
+ // @XmlAttribute(name = "minAng")
+ private String minAng;
+ // @XmlAttribute(name = "maxAng")
+ private String maxAng;
/**
* Gets the value of the pos property.
- *
+ *
* @return
* possible object is
- * {@link CTAdjPoint2D }
- *
+ * {@link AdjustPoint }
+ *
*/
- public CTAdjPoint2D getPos() {
+ public AdjustPoint getPos() {
return pos;
}
/**
* Sets the value of the pos property.
- *
+ *
* @param value
* allowed object is
- * {@link CTAdjPoint2D }
- *
+ * {@link AdjustPoint }
+ *
*/
- public void setPos(CTAdjPoint2D value) {
+ public void setPos(AdjustPoint value) {
this.pos = value;
}
@@ -104,11 +95,11 @@ public class CTPolarAdjustHandle {
/**
* Gets the value of the gdRefR property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getGdRefR() {
return gdRefR;
@@ -116,11 +107,11 @@ public class CTPolarAdjustHandle {
/**
* Sets the value of the gdRefR property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setGdRefR(String value) {
this.gdRefR = value;
@@ -132,11 +123,11 @@ public class CTPolarAdjustHandle {
/**
* Gets the value of the minR property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getMinR() {
return minR;
@@ -144,11 +135,11 @@ public class CTPolarAdjustHandle {
/**
* Sets the value of the minR property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setMinR(String value) {
this.minR = value;
@@ -160,11 +151,11 @@ public class CTPolarAdjustHandle {
/**
* Gets the value of the maxR property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getMaxR() {
return maxR;
@@ -172,11 +163,11 @@ public class CTPolarAdjustHandle {
/**
* Sets the value of the maxR property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setMaxR(String value) {
this.maxR = value;
@@ -188,11 +179,11 @@ public class CTPolarAdjustHandle {
/**
* Gets the value of the gdRefAng property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getGdRefAng() {
return gdRefAng;
@@ -200,11 +191,11 @@ public class CTPolarAdjustHandle {
/**
* Sets the value of the gdRefAng property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setGdRefAng(String value) {
this.gdRefAng = value;
@@ -216,11 +207,11 @@ public class CTPolarAdjustHandle {
/**
* Gets the value of the minAng property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getMinAng() {
return minAng;
@@ -228,11 +219,11 @@ public class CTPolarAdjustHandle {
/**
* Sets the value of the minAng property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setMinAng(String value) {
this.minAng = value;
@@ -244,11 +235,11 @@ public class CTPolarAdjustHandle {
/**
* Gets the value of the maxAng property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getMaxAng() {
return maxAng;
@@ -256,11 +247,11 @@ public class CTPolarAdjustHandle {
/**
* Sets the value of the maxAng property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setMaxAng(String value) {
this.maxAng = value;
@@ -270,4 +261,22 @@ public class CTPolarAdjustHandle {
return (this.maxAng!= null);
}
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof PolarAdjustHandle)) return false;
+ PolarAdjustHandle that = (PolarAdjustHandle) o;
+ return Objects.equals(pos, that.pos) &&
+ Objects.equals(gdRefR, that.gdRefR) &&
+ Objects.equals(minR, that.minR) &&
+ Objects.equals(maxR, that.maxR) &&
+ Objects.equals(gdRefAng, that.gdRefAng) &&
+ Objects.equals(minAng, that.minAng) &&
+ Objects.equals(maxAng, that.maxAng);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(pos, gdRefR, minR, maxR, gdRefAng, minAng, maxAng);
+ }
}
diff --git a/src/java/org/apache/poi/sl/draw/geom/PresetGeometries.java b/src/java/org/apache/poi/sl/draw/geom/PresetGeometries.java
index 6b191bd544..cc0f284b0b 100644
--- a/src/java/org/apache/poi/sl/draw/geom/PresetGeometries.java
+++ b/src/java/org/apache/poi/sl/draw/geom/PresetGeometries.java
@@ -19,73 +19,51 @@
package org.apache.poi.sl.draw.geom;
+import java.io.IOException;
import java.io.InputStream;
-import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.TreeMap;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.stream.StreamSource;
-import org.apache.poi.sl.draw.binding.CTCustomGeometry2D;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
import org.apache.poi.util.XMLHelper;
-/**
- *
- */
-public class PresetGeometries extends LinkedHashMap<String, CustomGeometry> {
+public final class PresetGeometries {
private final static POILogger LOG = POILogFactory.getLogger(PresetGeometries.class);
- private final static String BINDING_PACKAGE = "org.apache.poi.sl.draw.binding";
-
- private static class SingletonHelper {
- private static JAXBContext JAXB_CONTEXT;
- static {
- try {
- JAXB_CONTEXT = JAXBContext.newInstance(BINDING_PACKAGE);
- } catch (JAXBException e) {
- throw new RuntimeException(e);
- }
- }
- }
+ private final Map<String, CustomGeometry> map = new TreeMap<>();
- protected static PresetGeometries _inst;
+ private static class SingletonHelper{
+ private static final PresetGeometries INSTANCE = new PresetGeometries();
+ }
- protected PresetGeometries(){}
+ public static PresetGeometries getInstance(){
+ return SingletonHelper.INSTANCE;
+ }
- @SuppressWarnings("unused")
- public void init(InputStream is) throws XMLStreamException, JAXBException {
- XMLInputFactory staxFactory = XMLHelper.newXMLInputFactory();
- XMLStreamReader streamReader = staxFactory.createXMLStreamReader(new StreamSource(is));
+ private PresetGeometries() {
+ // use a local object first to not assign a partly constructed object in case of failure
try {
- // ignore StartElement:
- streamReader.nextTag();
-
- // JAXB:
- JAXBContext jaxbContext = SingletonHelper.JAXB_CONTEXT;
- Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
-
- long cntElem = 0;
- while (streamReader.hasNext() && streamReader.nextTag() == XMLStreamConstants.START_ELEMENT) {
- String name = streamReader.getLocalName();
- JAXBElement<CTCustomGeometry2D> el = unmarshaller.unmarshal(streamReader, CTCustomGeometry2D.class);
- CTCustomGeometry2D cus = el.getValue();
- cntElem++;
-
- if (containsKey(name)) {
- LOG.log(POILogger.WARN, "Duplicate definition of " + name);
+ try (InputStream is = PresetGeometries.class.getResourceAsStream("presetShapeDefinitions.xml")) {
+ XMLInputFactory staxFactory = XMLHelper.newXMLInputFactory();
+ XMLStreamReader sr = staxFactory.createXMLStreamReader(new StreamSource(is));
+ try {
+ PresetParser p = new PresetParser(PresetParser.Mode.FILE);
+ p.parse(sr);
+ p.getGeom().forEach(map::put);
+ } finally {
+ sr.close();
}
- put(name, new CustomGeometry(cus));
}
- } finally {
- streamReader.close();
+ } catch (IOException | XMLStreamException e){
+ throw new RuntimeException(e);
}
}
@@ -94,32 +72,35 @@ public class PresetGeometries extends LinkedHashMap<String, CustomGeometry> {
*/
public static CustomGeometry convertCustomGeometry(XMLStreamReader staxReader) {
try {
- JAXBContext jaxbContext = SingletonHelper.JAXB_CONTEXT;
- Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
- JAXBElement<CTCustomGeometry2D> el = unmarshaller.unmarshal(staxReader, CTCustomGeometry2D.class);
- return new CustomGeometry(el.getValue());
- } catch (JAXBException e) {
+ PresetParser p = new PresetParser(PresetParser.Mode.SHAPE);
+ p.parse(staxReader);
+ return p.getGeom().values().stream().findFirst().orElse(null);
+ } catch (XMLStreamException e) {
LOG.log(POILogger.ERROR, "Unable to parse single custom geometry", e);
return null;
}
}
- public static synchronized PresetGeometries getInstance(){
- if(_inst == null) {
- // use a local object first to not assign a partly constructed object
- // in case of failure
- PresetGeometries lInst = new PresetGeometries();
- try {
- try (InputStream is = PresetGeometries.class.
- getResourceAsStream("presetShapeDefinitions.xml")) {
- lInst.init(is);
- }
- } catch (Exception e){
- throw new RuntimeException(e);
- }
- _inst = lInst;
- }
+ public CustomGeometry get(String name) {
+ return name == null ? null : map.get(name);
+ }
+
+ public Set<String> keySet() {
+ return map.keySet();
+ }
+
+ public int size() {
+ return map.size();
+ }
+
+ @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
+ @Override
+ public boolean equals(Object o) {
+ return (this == o);
+ }
- return _inst;
+ @Override
+ public int hashCode() {
+ return Objects.hash(map);
}
}
diff --git a/src/java/org/apache/poi/sl/draw/geom/PresetParser.java b/src/java/org/apache/poi/sl/draw/geom/PresetParser.java
new file mode 100644
index 0000000000..fca15434b9
--- /dev/null
+++ b/src/java/org/apache/poi/sl/draw/geom/PresetParser.java
@@ -0,0 +1,573 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+
+package org.apache.poi.sl.draw.geom;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.BiConsumer;
+
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.poi.sl.usermodel.PaintStyle.PaintModifier;
+import org.apache.poi.util.Internal;
+import org.apache.poi.util.POILogFactory;
+import org.apache.poi.util.POILogger;
+
+@Internal
+class PresetParser {
+ enum Mode {
+ FILE(PresetParser::updateFile),
+ SHAPE_LST(PresetParser::updateShapeList),
+ SHAPE(PresetParser::updateShape),
+ GUIDE_LST(PresetParser::updateGuideList),
+ AH_LST(PresetParser::updateAhList),
+ CXN_LST(PresetParser::updateCxnList),
+ PATH_LST(PresetParser::updatePathLst),
+ PATH(PresetParser::updatePath);
+
+ interface Handler {
+ void update(PresetParser parser, XMLStreamReader sr) throws XMLStreamException;
+ }
+
+ final Handler handler;
+
+ Mode(Handler handler) {
+ this.handler = handler;
+ }
+ }
+
+ private final static POILogger LOG = POILogFactory.getLogger(PresetParser.class);
+
+ private Mode mode;
+
+ private final Map<String, CustomGeometry> geom = new HashMap<>();
+ private CustomGeometry customGeometry;
+ private boolean useAdjustValue;
+ private Path path;
+
+
+ PresetParser(Mode mode) {
+ this.mode = mode;
+ if (mode == Mode.SHAPE) {
+ customGeometry = new CustomGeometry();
+ geom.put("custom", customGeometry);
+ }
+ }
+
+ void parse(XMLStreamReader sr) throws XMLStreamException {
+ while (sr.hasNext()) {
+ switch (sr.next()) {
+ case XMLStreamConstants.START_ELEMENT:
+ mode.handler.update(this, sr);
+ break;
+ case XMLStreamConstants.END_ELEMENT:
+ endContext();
+ break;
+ case XMLStreamConstants.END_DOCUMENT:
+ return;
+ default:
+ break;
+ }
+ }
+ }
+
+ Map<String, CustomGeometry> getGeom() {
+ return geom;
+ }
+
+ private void updateFile(XMLStreamReader sr) {
+ final String name = sr.getLocalName();
+ assert("presetShapeDefinitons".equals(name));
+ mode = Mode.SHAPE_LST;
+ }
+
+ private void updateShapeList(XMLStreamReader sr) {
+ final String name = sr.getLocalName();
+ customGeometry = new CustomGeometry();
+ if (geom.containsKey(name)) {
+ LOG.log(POILogger.WARN, "Duplicate definition of " + name);
+ }
+ geom.put(name, customGeometry);
+ mode = Mode.SHAPE;
+ }
+
+ private void updateShape(XMLStreamReader sr) throws XMLStreamException {
+ final String name = sr.getLocalName();
+ switch (name) {
+ case "avLst":
+ useAdjustValue = true;
+ mode = Mode.GUIDE_LST;
+ break;
+ case "gdLst":
+ useAdjustValue = false;
+ mode = Mode.GUIDE_LST;
+ break;
+ case "ahLst":
+ mode = Mode.AH_LST;
+ break;
+ case "cxnLst":
+ mode = Mode.CXN_LST;
+ break;
+ case "rect":
+ addRectangle(sr);
+ break;
+ case "pathLst":
+ mode = Mode.PATH_LST;
+ break;
+ }
+ }
+
+ private void updateGuideList(XMLStreamReader sr) throws XMLStreamException {
+ final String name = sr.getLocalName();
+ assert("gd".equals(name));
+ final Guide gd;
+ if (useAdjustValue) {
+ customGeometry.addAdjustGuide((AdjustValue)(gd = new AdjustValue()));
+ } else {
+ customGeometry.addGeomGuide(gd = new Guide());
+ }
+
+ parseAttributes(sr, (key,val) -> {
+ switch (key) {
+ case "name":
+ // CollapsedStringAdapter
+ gd.setName(collapseString(val));
+ break;
+ case "fmla":
+ gd.setFmla(val);
+ break;
+ }
+ });
+
+ int tag = nextTag(sr);
+ assert(tag == XMLStreamConstants.END_ELEMENT);
+ }
+
+
+ private void updateAhList(XMLStreamReader sr) throws XMLStreamException {
+ String name = sr.getLocalName();
+ switch (name) {
+ case "ahXY":
+ addXY(sr);
+ break;
+
+ case "ahPolar":
+ addPolar(sr);
+ break;
+ }
+ }
+
+ private void addXY(XMLStreamReader sr) throws XMLStreamException {
+ XYAdjustHandle ahXY = new XYAdjustHandle();
+ customGeometry.addAdjustHandle(ahXY);
+
+ parseAttributes(sr, (key, val) -> {
+ switch (key) {
+ case "gdRefX":
+ ahXY.setGdRefX(collapseString(val));
+ break;
+ case "minX":
+ ahXY.setMinX(val);
+ break;
+ case "maxX":
+ ahXY.setMaxX(val);
+ break;
+ case "gdRefY":
+ ahXY.setGdRefY(collapseString(val));
+ break;
+ case "minY":
+ ahXY.setMinY(val);
+ break;
+ case "maxY":
+ ahXY.setMaxY(val);
+ break;
+ }
+ });
+
+ ahXY.setPos(parsePosPoint(sr));
+ }
+
+ private void addPolar(XMLStreamReader sr) throws XMLStreamException {
+ PolarAdjustHandle ahPolar = new PolarAdjustHandle();
+ customGeometry.addAdjustHandle(ahPolar);
+
+ parseAttributes(sr, (key, val) -> {
+ switch (key) {
+ case "gdRefR":
+ ahPolar.setGdRefR(collapseString(val));
+ break;
+ case "minR":
+ ahPolar.setMinR(val);
+ break;
+ case "maxR":
+ ahPolar.setMaxR(val);
+ break;
+ case "gdRefAng":
+ ahPolar.setGdRefAng(collapseString(val));
+ break;
+ case "minAng":
+ ahPolar.setMinAng(val);
+ break;
+ case "maxAng":
+ ahPolar.setMaxAng(val);
+ break;
+ }
+ });
+
+ ahPolar.setPos(parsePosPoint(sr));
+ }
+
+ private void updateCxnList(XMLStreamReader sr) throws XMLStreamException {
+ String name = sr.getLocalName();
+ assert("cxn".equals(name));
+
+ ConnectionSite cxn = new ConnectionSite();
+ customGeometry.addConnectionSite(cxn);
+
+ parseAttributes(sr, (key, val) -> {
+ if ("ang".equals(key)) {
+ cxn.setAng(val);
+ }
+ });
+
+ cxn.setPos(parsePosPoint(sr));
+ }
+
+ private void updatePathLst(XMLStreamReader sr) {
+ String name = sr.getLocalName();
+ assert("path".equals(name));
+
+ path = new Path();
+ customGeometry.addPath(path);
+
+ parseAttributes(sr, (key, val) -> {
+ switch (key) {
+ case "w":
+ path.setW(Long.parseLong(val));
+ break;
+ case "h":
+ path.setH(Long.parseLong(val));
+ break;
+ case "fill":
+ path.setFill(mapFill(val));
+ break;
+ case "stroke":
+ path.setStroke(Boolean.parseBoolean(val));
+ break;
+ case "extrusionOk":
+ path.setExtrusionOk(Boolean.parseBoolean(val));
+ break;
+ }
+ });
+
+ mode = Mode.PATH;
+ }
+
+ private static PaintModifier mapFill(String fill) {
+ switch (fill) {
+ default:
+ case "none":
+ return PaintModifier.NONE;
+ case "norm":
+ return PaintModifier.NORM;
+ case "lighten":
+ return PaintModifier.LIGHTEN;
+ case "lightenLess":
+ return PaintModifier.LIGHTEN_LESS;
+ case "darken":
+ return PaintModifier.DARKEN;
+ case "darkenLess":
+ return PaintModifier.DARKEN_LESS;
+ }
+ }
+
+ private void updatePath(XMLStreamReader sr) throws XMLStreamException {
+ String name = sr.getLocalName();
+ switch (name) {
+ case "close":
+ closePath(sr);
+ break;
+ case "moveTo":
+ moveTo(sr);
+ break;
+ case "lnTo":
+ lineTo(sr);
+ break;
+ case "arcTo":
+ arcTo(sr);
+ break;
+ case "quadBezTo":
+ quadBezTo(sr);
+ break;
+ case "cubicBezTo":
+ cubicBezTo(sr);
+ break;
+ }
+ }
+
+ private void closePath(XMLStreamReader sr) throws XMLStreamException {
+ path.addCommand(new ClosePathCommand());
+ int tag = nextTag(sr);
+ assert(tag == XMLStreamConstants.END_ELEMENT);
+ }
+
+ private void moveTo(XMLStreamReader sr) throws XMLStreamException {
+ MoveToCommand cmd = new MoveToCommand();
+ path.addCommand(cmd);
+
+ AdjustPoint pt = parsePtPoint(sr, true);
+ assert(pt != null);
+ cmd.setPt(pt);
+ }
+
+ private void lineTo(XMLStreamReader sr) throws XMLStreamException {
+ LineToCommand cmd = new LineToCommand();
+ path.addCommand(cmd);
+
+ AdjustPoint pt = parsePtPoint(sr, true);
+ assert(pt != null);
+ cmd.setPt(pt);
+ }
+
+ private void arcTo(XMLStreamReader sr) throws XMLStreamException {
+ ArcToCommand cmd = new ArcToCommand();
+ path.addCommand(cmd);
+ parseAttributes(sr, (key, val) -> {
+ switch (key) {
+ case "wR":
+ cmd.setWR(val);
+ break;
+ case "hR":
+ cmd.setHR(val);
+ break;
+ case "stAng":
+ cmd.setStAng(val);
+ break;
+ case "swAng":
+ cmd.setSwAng(val);
+ break;
+ }
+ });
+ int tag = nextTag(sr);
+ assert (tag == XMLStreamConstants.END_ELEMENT);
+ }
+
+ private void quadBezTo(XMLStreamReader sr) throws XMLStreamException {
+ QuadToCommand cmd = new QuadToCommand();
+ path.addCommand(cmd);
+ AdjustPoint pt1 = parsePtPoint(sr, false);
+ AdjustPoint pt2 = parsePtPoint(sr, true);
+ assert (pt1 != null && pt2 != null);
+ cmd.setPt1(pt1);
+ cmd.setPt2(pt2);
+ }
+
+ private void cubicBezTo(XMLStreamReader sr) throws XMLStreamException {
+ CurveToCommand cmd = new CurveToCommand();
+ path.addCommand(cmd);
+ AdjustPoint pt1 = parsePtPoint(sr, false);
+ AdjustPoint pt2 = parsePtPoint(sr, false);
+ AdjustPoint pt3 = parsePtPoint(sr, true);
+ assert (pt1 != null && pt2 != null && pt3 != null);
+ cmd.setPt1(pt1);
+ cmd.setPt2(pt2);
+ cmd.setPt3(pt3);
+ }
+
+ private void addRectangle(XMLStreamReader sr) throws XMLStreamException {
+ String[] ltrb = new String[4];
+ parseAttributes(sr, (key,val) -> {
+ switch (key) {
+ case "l":
+ ltrb[0] = val;
+ break;
+ case "t":
+ ltrb[1] = val;
+ break;
+ case "r":
+ ltrb[2] = val;
+ break;
+ case "b":
+ ltrb[3] = val;
+ break;
+ }
+ });
+
+ customGeometry.setTextBounds(ltrb[0],ltrb[1],ltrb[2],ltrb[3]);
+
+ int tag = nextTag(sr);
+ assert(tag == XMLStreamConstants.END_ELEMENT);
+ }
+
+
+ private void endContext() {
+ switch (mode) {
+ case FILE:
+ case SHAPE_LST:
+ mode = Mode.FILE;
+ break;
+ case SHAPE:
+ mode = Mode.SHAPE_LST;
+ break;
+ case CXN_LST:
+ case AH_LST:
+ case GUIDE_LST:
+ case PATH_LST:
+ useAdjustValue = false;
+ path = null;
+ mode = Mode.SHAPE;
+ break;
+ case PATH:
+ path = null;
+ mode = Mode.PATH_LST;
+ break;
+ }
+ }
+
+ private AdjustPoint parsePosPoint(XMLStreamReader sr) throws XMLStreamException {
+ return parseAdjPoint(sr, true, "pos");
+ }
+
+ private AdjustPoint parsePtPoint(XMLStreamReader sr, boolean closeOuter) throws XMLStreamException {
+ return parseAdjPoint(sr, closeOuter, "pt");
+ }
+
+ private AdjustPoint parseAdjPoint(XMLStreamReader sr, boolean closeOuter, String name) throws XMLStreamException {
+ int tag = nextTag(sr);
+ if (tag == XMLStreamConstants.END_ELEMENT) {
+ return null;
+ }
+
+ assert (name.equals(sr.getLocalName()));
+
+ AdjustPoint pos = new AdjustPoint();
+ parseAttributes(sr, (key, val) -> {
+ switch (key) {
+ case "x":
+ pos.setX(val);
+ break;
+ case "y":
+ pos.setY(val);
+ break;
+ }
+ });
+ tag = nextTag(sr);
+ assert(tag == XMLStreamConstants.END_ELEMENT);
+ if (closeOuter) {
+ tag = nextTag(sr);
+ assert(tag == XMLStreamConstants.END_ELEMENT);
+ }
+ return pos;
+ }
+
+ private void parseAttributes(XMLStreamReader sr, BiConsumer<String,String> c) {
+ for (int i=0; i<sr.getAttributeCount(); i++) {
+ c.accept(sr.getAttributeLocalName(i), sr.getAttributeValue(i));
+ }
+ }
+
+ /**
+ * Reimplement {@link XMLStreamReader#nextTag()} because of differences of XmlBeans and Xerces XMLStreamReader.
+ * XmlBeans doesn't return the END_ELEMENT on nextTag()
+ *
+ * @param sr the stream reader
+ * @return the next tag type (START_ELEMENT, END_ELEMENT, END_DOCUMENT)
+ * @throws XMLStreamException if reading the next tag fails
+ */
+ private static int nextTag(XMLStreamReader sr) throws XMLStreamException {
+ int tag;
+ do {
+ tag = sr.next();
+ } while (
+ tag != XMLStreamConstants.START_ELEMENT &&
+ tag != XMLStreamConstants.END_ELEMENT &&
+ tag != XMLStreamConstants.END_DOCUMENT
+ );
+ return tag;
+ }
+
+ /**
+ * Removes leading and trailing whitespaces of the string given as the parameter, then truncate any
+ * sequence of tab, CR, LF, and SP by a single whitespace character ' '.
+ */
+ private static String collapseString(String text) {
+ if (text==null) {
+ return null;
+ }
+
+ int len = text.length();
+
+ // most of the texts are already in the collapsed form. so look for the first whitespace in the hope that we
+ // will never see it.
+ int s;
+ for (s=0; s<len; s++) {
+ if (isWhiteSpace(text.charAt(s))) {
+ break;
+ }
+ }
+
+ if (s == len) {
+ // the input happens to be already collapsed.
+ return text;
+ }
+
+ // we now know that the input contains spaces. let's sit down and do the collapsing normally.
+ // allocate enough size to avoid re-allocation
+ StringBuilder result = new StringBuilder(len);
+
+ if (s != 0) {
+ for(int i=0; i<s; i++) {
+ result.append(text.charAt(i));
+ }
+ result.append(' ');
+ }
+
+ boolean inStripMode = true;
+ for (int i = s+1; i < len; i++) {
+ char ch = text.charAt(i);
+ boolean b = isWhiteSpace(ch);
+
+ if (inStripMode && b) {
+ // skip this character
+ continue;
+ }
+
+ inStripMode = b;
+ result.append(inStripMode ? ' ' : ch);
+ }
+
+ // remove trailing whitespaces
+ len = result.length();
+ if (len > 0 && result.charAt(len - 1) == ' ') {
+ result.setLength(len - 1);
+ }
+
+ // whitespaces are already collapsed, so all we have to do is
+ // to remove the last one character if it's a whitespace.
+ return result.toString();
+ }
+
+ /** returns true if the specified char is a white space character. */
+ private static boolean isWhiteSpace(char ch) {
+ return ch == 0x9 || ch == 0xA || ch == 0xD || ch == 0x20;
+ }
+}
diff --git a/src/java/org/apache/poi/sl/draw/geom/QuadToCommand.java b/src/java/org/apache/poi/sl/draw/geom/QuadToCommand.java
index 38d1fd7289..4278a00274 100644
--- a/src/java/org/apache/poi/sl/draw/geom/QuadToCommand.java
+++ b/src/java/org/apache/poi/sl/draw/geom/QuadToCommand.java
@@ -20,25 +20,71 @@
package org.apache.poi.sl.draw.geom;
import java.awt.geom.Path2D;
+import java.util.Objects;
-import org.apache.poi.sl.draw.binding.CTAdjPoint2D;
+/**
+ * <p>Java class for CT_Path2DQuadBezierTo complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * &lt;complexType name="CT_Path2DQuadBezierTo"&gt;
+ * &lt;complexContent&gt;
+ * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ * &lt;sequence&gt;
+ * &lt;element name="pt" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_AdjPoint2D" maxOccurs="2" minOccurs="2"/&gt;
+ * &lt;/sequence&gt;
+ * &lt;/restriction&gt;
+ * &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * </pre>
+ *
+ *
+ */
+// @XmlAccessorType(XmlAccessType.FIELD)
+// @XmlType(name = "CT_Path2DQuadBezierTo", propOrder = {"pt"})
+public final class QuadToCommand implements PathCommand {
+
+ // @XmlElement(required = true)
+ private final AdjustPoint pt1 = new AdjustPoint();
+ // @XmlElement(required = true)
+ private final AdjustPoint pt2 = new AdjustPoint();
-public class QuadToCommand implements PathCommand {
- private String arg1, arg2, arg3, arg4;
+ public void setPt1(AdjustPoint pt1) {
+ if (pt1 != null) {
+ this.pt1.setX(pt1.getX());
+ this.pt1.setY(pt1.getY());
+ }
+ }
- QuadToCommand(CTAdjPoint2D pt1, CTAdjPoint2D pt2){
- arg1 = pt1.getX();
- arg2 = pt1.getY();
- arg3 = pt2.getX();
- arg4 = pt2.getY();
+ public void setPt2(AdjustPoint pt2) {
+ if (pt2 != null) {
+ this.pt2.setX(pt2.getX());
+ this.pt2.setY(pt2.getY());
+ }
}
@Override
public void execute(Path2D.Double path, Context ctx){
- double x1 = ctx.getValue(arg1);
- double y1 = ctx.getValue(arg2);
- double x2 = ctx.getValue(arg3);
- double y2 = ctx.getValue(arg4);
+ double x1 = ctx.getValue(pt1.getX());
+ double y1 = ctx.getValue(pt1.getY());
+ double x2 = ctx.getValue(pt2.getX());
+ double y2 = ctx.getValue(pt2.getY());
path.quadTo(x1, y1, x2, y2);
}
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof QuadToCommand)) return false;
+ QuadToCommand that = (QuadToCommand) o;
+ return Objects.equals(pt1, that.pt1) &&
+ Objects.equals(pt2, that.pt2);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(pt1, pt2);
+ }
+
}
diff --git a/src/java/org/apache/poi/sl/draw/binding/CTXYAdjustHandle.java b/src/java/org/apache/poi/sl/draw/geom/XYAdjustHandle.java
index 6f1ce0324d..46975da2c8 100644
--- a/src/java/org/apache/poi/sl/draw/binding/CTXYAdjustHandle.java
+++ b/src/java/org/apache/poi/sl/draw/geom/XYAdjustHandle.java
@@ -15,22 +15,15 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.sl.draw.binding;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+package org.apache.poi.sl.draw.geom;
+import java.util.Objects;
/**
* <p>Java class for CT_XYAdjustHandle complex type.
- *
+ *
* <p>The following schema fragment specifies the expected content contained within this class.
- *
+ *
* <pre>
* &lt;complexType name="CT_XYAdjustHandle"&gt;
* &lt;complexContent&gt;
@@ -48,53 +41,51 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
* &lt;/complexContent&gt;
* &lt;/complexType&gt;
* </pre>
- *
- *
+ *
+ *
*/
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_XYAdjustHandle", propOrder = {
- "pos"
-})
-public class CTXYAdjustHandle {
+// @XmlAccessorType(XmlAccessType.FIELD)
+// @XmlType(name = "CT_XYAdjustHandle", propOrder = {"pos"})
+public final class XYAdjustHandle implements AdjustHandle {
- @XmlElement(required = true)
- protected CTAdjPoint2D pos;
- @XmlAttribute(name = "gdRefX")
- @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
- protected String gdRefX;
- @XmlAttribute(name = "minX")
- protected String minX;
- @XmlAttribute(name = "maxX")
- protected String maxX;
- @XmlAttribute(name = "gdRefY")
- @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
- protected String gdRefY;
- @XmlAttribute(name = "minY")
- protected String minY;
- @XmlAttribute(name = "maxY")
- protected String maxY;
+ // @XmlElement(required = true)
+ private AdjustPoint pos;
+ // @XmlAttribute(name = "gdRefX")
+ // @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+ private String gdRefX;
+ // @XmlAttribute(name = "minX")
+ private String minX;
+ // @XmlAttribute(name = "maxX")
+ private String maxX;
+ // @XmlAttribute(name = "gdRefY")
+ // @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+ private String gdRefY;
+ // @XmlAttribute(name = "minY")
+ private String minY;
+ // @XmlAttribute(name = "maxY")
+ private String maxY;
/**
* Gets the value of the pos property.
- *
+ *
* @return
* possible object is
* {@link CTAdjPoint2D }
- *
+ *
*/
- public CTAdjPoint2D getPos() {
+ public AdjustPoint getPos() {
return pos;
}
/**
* Sets the value of the pos property.
- *
+ *
* @param value
* allowed object is
* {@link CTAdjPoint2D }
- *
+ *
*/
- public void setPos(CTAdjPoint2D value) {
+ public void setPos(AdjustPoint value) {
this.pos = value;
}
@@ -104,11 +95,11 @@ public class CTXYAdjustHandle {
/**
* Gets the value of the gdRefX property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getGdRefX() {
return gdRefX;
@@ -116,11 +107,11 @@ public class CTXYAdjustHandle {
/**
* Sets the value of the gdRefX property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setGdRefX(String value) {
this.gdRefX = value;
@@ -132,11 +123,11 @@ public class CTXYAdjustHandle {
/**
* Gets the value of the minX property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getMinX() {
return minX;
@@ -144,11 +135,11 @@ public class CTXYAdjustHandle {
/**
* Sets the value of the minX property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setMinX(String value) {
this.minX = value;
@@ -160,11 +151,11 @@ public class CTXYAdjustHandle {
/**
* Gets the value of the maxX property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getMaxX() {
return maxX;
@@ -172,11 +163,11 @@ public class CTXYAdjustHandle {
/**
* Sets the value of the maxX property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setMaxX(String value) {
this.maxX = value;
@@ -188,11 +179,11 @@ public class CTXYAdjustHandle {
/**
* Gets the value of the gdRefY property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getGdRefY() {
return gdRefY;
@@ -200,11 +191,11 @@ public class CTXYAdjustHandle {
/**
* Sets the value of the gdRefY property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setGdRefY(String value) {
this.gdRefY = value;
@@ -216,11 +207,11 @@ public class CTXYAdjustHandle {
/**
* Gets the value of the minY property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getMinY() {
return minY;
@@ -228,11 +219,11 @@ public class CTXYAdjustHandle {
/**
* Sets the value of the minY property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setMinY(String value) {
this.minY = value;
@@ -244,11 +235,11 @@ public class CTXYAdjustHandle {
/**
* Gets the value of the maxY property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getMaxY() {
return maxY;
@@ -256,11 +247,11 @@ public class CTXYAdjustHandle {
/**
* Sets the value of the maxY property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setMaxY(String value) {
this.maxY = value;
@@ -270,4 +261,22 @@ public class CTXYAdjustHandle {
return (this.maxY!= null);
}
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof XYAdjustHandle)) return false;
+ XYAdjustHandle that = (XYAdjustHandle) o;
+ return Objects.equals(pos, that.pos) &&
+ Objects.equals(gdRefX, that.gdRefX) &&
+ Objects.equals(minX, that.minX) &&
+ Objects.equals(maxX, that.maxX) &&
+ Objects.equals(gdRefY, that.gdRefY) &&
+ Objects.equals(minY, that.minY) &&
+ Objects.equals(maxY, that.maxY);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(pos, gdRefX, minX, maxX, gdRefY, minY, maxY);
+ }
}
diff --git a/src/java/org/apache/poi/sl/usermodel/RectAlign.java b/src/java/org/apache/poi/sl/usermodel/RectAlign.java
index 471043f41d..8fd9efc0db 100644
--- a/src/java/org/apache/poi/sl/usermodel/RectAlign.java
+++ b/src/java/org/apache/poi/sl/usermodel/RectAlign.java
@@ -21,8 +21,6 @@ package org.apache.poi.sl.usermodel;
/**
* Specifies possible rectangle alignment types.
* See org.openxmlformats.schemas.drawingml.x2006.main.STRectAlignment
- *
- * @see org.apache.poi.sl.draw.binding.STRectAlignment
*/
public enum RectAlign {
/** Top-Left rectangle alignment */
diff --git a/src/multimodule/ooxml-schemas/java9/module-info.class b/src/multimodule/ooxml-schemas/java9/module-info.class
new file mode 100644
index 0000000000..83a16f01ec
--- /dev/null
+++ b/src/multimodule/ooxml-schemas/java9/module-info.class
Binary files differ
diff --git a/src/multimodule/ooxml-schemas/java9/module-info.java b/src/multimodule/ooxml-schemas/java9/module-info.java
new file mode 100644
index 0000000000..f5ec07df9a
--- /dev/null
+++ b/src/multimodule/ooxml-schemas/java9/module-info.java
@@ -0,0 +1,50 @@
+/* ====================================================================
+ Copyright 2017 Andreas Beeker (kiwiwings@apache.org)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+==================================================================== */
+
+
+open module org.apache.poi.ooxml.schemas {
+ requires transitive xmlbeans;
+ requires java.xml;
+ exports com.microsoft.schemas.compatibility;
+ exports com.microsoft.schemas.office.excel;
+ exports com.microsoft.schemas.office.office;
+ exports com.microsoft.schemas.office.powerpoint;
+ exports com.microsoft.schemas.office.visio.x2012.main;
+ exports com.microsoft.schemas.office.word;
+ exports com.microsoft.schemas.vml;
+ exports org.openxmlformats.schemas.drawingml.x2006.chart;
+ exports org.openxmlformats.schemas.drawingml.x2006.chartDrawing;
+ exports org.openxmlformats.schemas.drawingml.x2006.compatibility;
+ exports org.openxmlformats.schemas.drawingml.x2006.diagram;
+ exports org.openxmlformats.schemas.drawingml.x2006.lockedCanvas;
+ exports org.openxmlformats.schemas.drawingml.x2006.main;
+ exports org.openxmlformats.schemas.drawingml.x2006.picture;
+ exports org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing;
+ exports org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing;
+ exports org.openxmlformats.schemas.officeDocument.x2006.bibliography;
+ exports org.openxmlformats.schemas.officeDocument.x2006.characteristics;
+ exports org.openxmlformats.schemas.officeDocument.x2006.customProperties;
+ exports org.openxmlformats.schemas.officeDocument.x2006.customXml;
+ exports org.openxmlformats.schemas.officeDocument.x2006.docPropsVTypes;
+ exports org.openxmlformats.schemas.officeDocument.x2006.extendedProperties;
+ exports org.openxmlformats.schemas.officeDocument.x2006.math;
+ exports org.openxmlformats.schemas.officeDocument.x2006.relationships;
+ exports org.openxmlformats.schemas.presentationml.x2006.main;
+ exports org.openxmlformats.schemas.schemaLibrary.x2006.main;
+ exports org.openxmlformats.schemas.spreadsheetml.x2006.main;
+ exports org.openxmlformats.schemas.wordprocessingml.x2006.main;
+ // opens schemaorg_apache_xmlbeans.system.OoxmlSchemas to xmlbeans;
+} \ No newline at end of file
diff --git a/src/multimodule/ooxml-security/java9/module-info.class b/src/multimodule/ooxml-security/java9/module-info.class
new file mode 100644
index 0000000000..ce9793c57b
--- /dev/null
+++ b/src/multimodule/ooxml-security/java9/module-info.class
Binary files differ
diff --git a/src/multimodule/ooxml-security/java9/module-info.java b/src/multimodule/ooxml-security/java9/module-info.java
new file mode 100644
index 0000000000..4946fdbf0d
--- /dev/null
+++ b/src/multimodule/ooxml-security/java9/module-info.java
@@ -0,0 +1,31 @@
+/* ====================================================================
+ Copyright 2017 Andreas Beeker (kiwiwings@apache.org)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+==================================================================== */
+
+
+open module org.apache.poi.ooxml.security {
+ requires transitive xmlbeans;
+ requires java.xml;
+ exports com.microsoft.schemas.office.x2006.digsig;
+ exports com.microsoft.schemas.office.x2006.encryption;
+ exports com.microsoft.schemas.office.x2006.keyEncryptor.certificate;
+ exports com.microsoft.schemas.office.x2006.keyEncryptor.password;
+ exports org.etsi.uri.x01903.v13;
+ exports org.etsi.uri.x01903.v14;
+ exports org.openxmlformats.schemas.xpackage.x2006.digitalSignature;
+ exports org.openxmlformats.schemas.xpackage.x2006.relationships;
+ exports org.w3.x2000.x09.xmldsig;
+ // opens schemaorg_apache_xmlbeans.system.OoxmlSecurity to xmlbeans;
+} \ No newline at end of file
diff --git a/src/multimodule/poi/java9/module-info.java b/src/multimodule/poi/java9/module-info.java
new file mode 100644
index 0000000000..c04f50f955
--- /dev/null
+++ b/src/multimodule/poi/java9/module-info.java
@@ -0,0 +1,86 @@
+/* ====================================================================
+ Copyright 2017 Andreas Beeker (kiwiwings@apache.org)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+==================================================================== */
+
+module org.apache.poi.poi {
+ requires org.apache.commons.collections4;
+ requires org.apache.commons.codec;
+ requires commons.math3;
+ requires SparseBitSet;
+ requires commons.logging;
+
+
+ exports org.apache.poi.common.usermodel.fonts;
+ exports org.apache.poi.ddf;
+ exports org.apache.poi.extractor;
+ exports org.apache.poi.hpsf;
+ exports org.apache.poi.hpsf.extractor;
+ exports org.apache.poi.hpsf.wellknown;
+ exports org.apache.poi.hssf;
+ exports org.apache.poi.hssf.dev;
+ exports org.apache.poi.hssf.eventmodel;
+ exports org.apache.poi.hssf.eventusermodel;
+ exports org.apache.poi.hssf.eventusermodel.dummyrecord;
+ exports org.apache.poi.hssf.extractor;
+ exports org.apache.poi.hssf.model;
+ exports org.apache.poi.hssf.record;
+ exports org.apache.poi.hssf.record.aggregates;
+ exports org.apache.poi.hssf.record.cf;
+ exports org.apache.poi.hssf.record.chart;
+ exports org.apache.poi.hssf.record.common;
+ exports org.apache.poi.hssf.record.cont;
+ exports org.apache.poi.hssf.record.crypto;
+ exports org.apache.poi.hssf.record.pivottable;
+ exports org.apache.poi.hssf.usermodel;
+ exports org.apache.poi.hssf.usermodel.helpers;
+ exports org.apache.poi.hssf.util;
+ exports org.apache.poi.poifs.common;
+ exports org.apache.poi.poifs.crypt;
+ exports org.apache.poi.poifs.crypt.binaryrc4;
+ exports org.apache.poi.poifs.crypt.cryptoapi;
+ exports org.apache.poi.poifs.crypt.standard;
+ exports org.apache.poi.poifs.crypt.xor;
+ exports org.apache.poi.poifs.dev;
+ exports org.apache.poi.poifs.eventfilesystem;
+ exports org.apache.poi.poifs.filesystem;
+ exports org.apache.poi.poifs.macros;
+ exports org.apache.poi.poifs.nio;
+ exports org.apache.poi.poifs.property;
+ exports org.apache.poi.poifs.storage;
+ exports org.apache.poi.sl.draw;
+ exports org.apache.poi.sl.draw.geom;
+ exports org.apache.poi.sl.extractor;
+ exports org.apache.poi.sl.image;
+ exports org.apache.poi.sl.usermodel;
+ exports org.apache.poi.ss;
+ exports org.apache.poi.ss.extractor;
+ exports org.apache.poi.ss.format;
+ exports org.apache.poi.ss.formula;
+ exports org.apache.poi.ss.formula.atp;
+ exports org.apache.poi.ss.formula.constant;
+ exports org.apache.poi.ss.formula.eval;
+ exports org.apache.poi.ss.formula.eval.forked;
+ exports org.apache.poi.ss.formula.function;
+ exports org.apache.poi.ss.formula.functions;
+ exports org.apache.poi.ss.formula.ptg;
+ exports org.apache.poi.ss.formula.udf;
+ exports org.apache.poi.ss.usermodel;
+ exports org.apache.poi.ss.usermodel.charts;
+ exports org.apache.poi.ss.usermodel.helpers;
+ exports org.apache.poi.ss.util;
+ exports org.apache.poi.ss.util.cellwalk;
+ exports org.apache.poi.util;
+ exports org.apache.poi.wp.usermodel;
+} \ No newline at end of file
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java
index e77820184e..eccd5ba778 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java
+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java
@@ -59,7 +59,7 @@ import org.openxmlformats.schemas.drawingml.x2006.main.*;
@Beta
public abstract class XSLFSimpleShape extends XSLFShape
implements SimpleShape<XSLFShape,XSLFTextParagraph> {
- private static CTOuterShadowEffect NO_SHADOW = CTOuterShadowEffect.Factory.newInstance();
+ private static final CTOuterShadowEffect NO_SHADOW = CTOuterShadowEffect.Factory.newInstance();
private static final POILogger LOG = POILogFactory.getLogger(XSLFSimpleShape.class);
/* package */XSLFSimpleShape(XmlObject shape, XSLFSheet sheet) {
@@ -981,7 +981,10 @@ public abstract class XSLFSimpleShape extends XSLFShape
//noinspection deprecation
for (CTGeomGuide g : gp.getPrstGeom().getAvLst().getGdArray()) {
if (g.getName().equals(name)) {
- return new Guide(g.getName(), g.getFmla());
+ Guide gd = new Guide();
+ gd.setName(g.getName());
+ gd.setFmla(g.getFmla());
+ return gd;
}
}
}
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/geom/TestFormulaParser.java b/src/ooxml/testcases/org/apache/poi/xslf/geom/TestFormulaParser.java
index 36d42471ca..e78cefd048 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/geom/TestFormulaParser.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/geom/TestFormulaParser.java
@@ -20,8 +20,10 @@ package org.apache.poi.xslf.geom;
import static org.junit.Assert.assertEquals;
-import org.apache.poi.sl.draw.binding.CTCustomGeometry2D;
-import org.apache.poi.sl.draw.geom.*;
+import org.apache.poi.sl.draw.geom.Context;
+import org.apache.poi.sl.draw.geom.CustomGeometry;
+import org.apache.poi.sl.draw.geom.Formula;
+import org.apache.poi.sl.draw.geom.Guide;
import org.junit.Test;
/**
@@ -34,17 +36,17 @@ public class TestFormulaParser {
public void testParse(){
Formula[] ops = {
- new Guide("adj1", "val 100"),
- new Guide("adj2", "val 200"),
- new Guide("adj3", "val -1"),
- new Guide("a1", "*/ adj1 2 adj2"), // a1 = 100*2 / 200
- new Guide("a2", "+- adj2 a1 adj1"), // a2 = 200 + a1 - 100
- new Guide("a3", "+/ adj1 adj2 adj2"), // a3 = (100 + 200) / 200
- new Guide("a4", "?: adj3 adj1 adj2"), // a4 = adj3 > 0 ? adj1 : adj2
- new Guide("a5", "abs -2"),
+ newGuide("adj1", "val 100"),
+ newGuide("adj2", "val 200"),
+ newGuide("adj3", "val -1"),
+ newGuide("a1", "*/ adj1 2 adj2"), // a1 = 100*2 / 200
+ newGuide("a2", "+- adj2 a1 adj1"), // a2 = 200 + a1 - 100
+ newGuide("a3", "+/ adj1 adj2 adj2"), // a3 = (100 + 200) / 200
+ newGuide("a4", "?: adj3 adj1 adj2"), // a4 = adj3 > 0 ? adj1 : adj2
+ newGuide("a5", "abs -2"),
};
- CustomGeometry geom = new CustomGeometry(new CTCustomGeometry2D());
+ CustomGeometry geom = new CustomGeometry();
Context ctx = new Context(geom, null, null);
for(Formula fmla : ops) {
ctx.evaluate(fmla);
@@ -58,4 +60,11 @@ public class TestFormulaParser {
assertEquals(200.0, ctx.getValue("a4"), 0.0);
assertEquals(2.0, ctx.getValue("a5"), 0.0);
}
+
+ private static Guide newGuide(String name, String fmla) {
+ Guide gd = new Guide();
+ gd.setName(name);
+ gd.setFmla(fmla);
+ return gd;
+ }
}
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java
index ddbfe26652..6937aad832 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java
@@ -21,24 +21,19 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.image.BufferedImage;
+import java.io.File;
import java.io.IOException;
import java.util.List;
-import org.apache.poi.sl.draw.DrawFactory;
-import org.apache.poi.sl.draw.geom.TestPresetGeometries;
+import org.apache.poi.POIDataSamples;
import org.apache.poi.sl.usermodel.Placeholder;
-import org.apache.poi.sl.usermodel.Slide;
import org.apache.poi.sl.usermodel.StrokeStyle.LineCap;
import org.apache.poi.sl.usermodel.StrokeStyle.LineDash;
import org.apache.poi.util.Units;
import org.apache.poi.xslf.XSLFTestDataSamples;
+import org.apache.poi.xslf.util.PPTX2PNG;
import org.apache.xmlbeans.XmlObject;
import org.junit.Test;
import org.openxmlformats.schemas.drawingml.x2006.main.CTEffectStyleItem;
@@ -53,330 +48,277 @@ import org.openxmlformats.schemas.drawingml.x2006.main.STPresetLineDashVal;
import org.openxmlformats.schemas.drawingml.x2006.main.STShapeType;
public class TestXSLFSimpleShape {
-
+
@Test
public void testLineStyles() throws IOException {
- XMLSlideShow ppt = new XMLSlideShow();
- XSLFSlide slide = ppt.createSlide();
-
- XSLFSimpleShape shape = slide.createAutoShape();
- assertEquals(1, slide.getShapes().size());
- // line properties are not set by default
- assertFalse(getSpPr(shape).isSetLn());
-
- assertEquals(0., shape.getLineWidth(), 0);
- assertNull(shape.getLineColor());
- assertNull(shape.getLineDash());
- assertNull(shape.getLineCap());
-
- shape.setLineWidth(0);
- shape.setLineColor(null);
- shape.setLineDash(null);
- shape.setLineCap(null);
-
- assertTrue(getSpPr(shape).isSetLn());
- assertTrue(getSpPr(shape).getLn().isSetNoFill());
-
- // line width
- shape.setLineWidth(1.0);
- assertEquals(1.0, shape.getLineWidth(), 0);
- assertEquals(Units.EMU_PER_POINT, getSpPr(shape).getLn().getW());
- shape.setLineWidth(5.5);
- assertEquals(5.5, shape.getLineWidth(), 0);
- assertEquals(Units.toEMU(5.5), getSpPr(shape).getLn().getW());
- shape.setLineWidth(0.0);
- // setting line width to zero unsets the W attribute
- assertFalse(getSpPr(shape).getLn().isSetW());
-
- // line cap
- shape.setLineCap(LineCap.FLAT);
- assertEquals(LineCap.FLAT, shape.getLineCap());
- assertEquals(STLineCap.FLAT, getSpPr(shape).getLn().getCap());
- shape.setLineCap(LineCap.SQUARE);
- assertEquals(LineCap.SQUARE, shape.getLineCap());
- assertEquals(STLineCap.SQ, getSpPr(shape).getLn().getCap());
- shape.setLineCap(LineCap.ROUND);
- assertEquals(LineCap.ROUND, shape.getLineCap());
- assertEquals(STLineCap.RND, getSpPr(shape).getLn().getCap());
- shape.setLineCap(null);
- // setting cap to null unsets the Cap attribute
- assertFalse(getSpPr(shape).getLn().isSetCap());
-
- // line dash
- shape.setLineDash(LineDash.SOLID);
- assertEquals(LineDash.SOLID, shape.getLineDash());
- assertEquals(STPresetLineDashVal.SOLID, getSpPr(shape).getLn().getPrstDash().getVal());
- shape.setLineDash(LineDash.DASH_DOT);
- assertEquals(LineDash.DASH_DOT, shape.getLineDash());
- assertEquals(STPresetLineDashVal.DASH_DOT, getSpPr(shape).getLn().getPrstDash().getVal());
- shape.setLineDash(LineDash.LG_DASH_DOT);
- assertEquals(LineDash.LG_DASH_DOT, shape.getLineDash());
- assertEquals(STPresetLineDashVal.LG_DASH_DOT, getSpPr(shape).getLn().getPrstDash().getVal());
- shape.setLineDash(null);
- // setting dash width to null unsets the Dash element
- assertFalse(getSpPr(shape).getLn().isSetPrstDash());
-
- // line color
- assertFalse(getSpPr(shape).getLn().isSetSolidFill());
- shape.setLineColor(Color.RED);
- assertEquals(Color.RED, shape.getLineColor());
- assertTrue(getSpPr(shape).getLn().isSetSolidFill());
- shape.setLineColor(Color.BLUE);
- assertEquals(Color.BLUE, shape.getLineColor());
- assertTrue(getSpPr(shape).getLn().isSetSolidFill());
- shape.setLineColor(null);
- assertNull(shape.getLineColor());
- // setting dash width to null unsets the SolidFill element
- assertFalse(getSpPr(shape).getLn().isSetSolidFill());
-
- XSLFSimpleShape ln2 = slide.createAutoShape();
- ln2.setLineDash(LineDash.DOT);
- assertEquals(LineDash.DOT, ln2.getLineDash());
- ln2.setLineWidth(0.);
- assertEquals(0., ln2.getLineWidth(), 0);
-
- XSLFSimpleShape ln3 = slide.createAutoShape();
- ln3.setLineWidth(1.);
- assertEquals(1., ln3.getLineWidth(), 0);
- ln3.setLineDash(null);
- assertNull(ln3.getLineDash());
- ln3.setLineCap(null);
- assertNull(ln3.getLineDash());
-
- ppt.close();
+ try (XMLSlideShow ppt = new XMLSlideShow()) {
+ XSLFSlide slide = ppt.createSlide();
+
+ XSLFSimpleShape shape = slide.createAutoShape();
+ assertEquals(1, slide.getShapes().size());
+ // line properties are not set by default
+ assertFalse(getSpPr(shape).isSetLn());
+
+ assertEquals(0., shape.getLineWidth(), 0);
+ assertNull(shape.getLineColor());
+ assertNull(shape.getLineDash());
+ assertNull(shape.getLineCap());
+
+ shape.setLineWidth(0);
+ shape.setLineColor(null);
+ shape.setLineDash(null);
+ shape.setLineCap(null);
+
+ assertTrue(getSpPr(shape).isSetLn());
+ assertTrue(getSpPr(shape).getLn().isSetNoFill());
+
+ // line width
+ shape.setLineWidth(1.0);
+ assertEquals(1.0, shape.getLineWidth(), 0);
+ assertEquals(Units.EMU_PER_POINT, getSpPr(shape).getLn().getW());
+ shape.setLineWidth(5.5);
+ assertEquals(5.5, shape.getLineWidth(), 0);
+ assertEquals(Units.toEMU(5.5), getSpPr(shape).getLn().getW());
+ shape.setLineWidth(0.0);
+ // setting line width to zero unsets the W attribute
+ assertFalse(getSpPr(shape).getLn().isSetW());
+
+ // line cap
+ shape.setLineCap(LineCap.FLAT);
+ assertEquals(LineCap.FLAT, shape.getLineCap());
+ assertEquals(STLineCap.FLAT, getSpPr(shape).getLn().getCap());
+ shape.setLineCap(LineCap.SQUARE);
+ assertEquals(LineCap.SQUARE, shape.getLineCap());
+ assertEquals(STLineCap.SQ, getSpPr(shape).getLn().getCap());
+ shape.setLineCap(LineCap.ROUND);
+ assertEquals(LineCap.ROUND, shape.getLineCap());
+ assertEquals(STLineCap.RND, getSpPr(shape).getLn().getCap());
+ shape.setLineCap(null);
+ // setting cap to null unsets the Cap attribute
+ assertFalse(getSpPr(shape).getLn().isSetCap());
+
+ // line dash
+ shape.setLineDash(LineDash.SOLID);
+ assertEquals(LineDash.SOLID, shape.getLineDash());
+ assertEquals(STPresetLineDashVal.SOLID, getSpPr(shape).getLn().getPrstDash().getVal());
+ shape.setLineDash(LineDash.DASH_DOT);
+ assertEquals(LineDash.DASH_DOT, shape.getLineDash());
+ assertEquals(STPresetLineDashVal.DASH_DOT, getSpPr(shape).getLn().getPrstDash().getVal());
+ shape.setLineDash(LineDash.LG_DASH_DOT);
+ assertEquals(LineDash.LG_DASH_DOT, shape.getLineDash());
+ assertEquals(STPresetLineDashVal.LG_DASH_DOT, getSpPr(shape).getLn().getPrstDash().getVal());
+ shape.setLineDash(null);
+ // setting dash width to null unsets the Dash element
+ assertFalse(getSpPr(shape).getLn().isSetPrstDash());
+
+ // line color
+ assertFalse(getSpPr(shape).getLn().isSetSolidFill());
+ shape.setLineColor(Color.RED);
+ assertEquals(Color.RED, shape.getLineColor());
+ assertTrue(getSpPr(shape).getLn().isSetSolidFill());
+ shape.setLineColor(Color.BLUE);
+ assertEquals(Color.BLUE, shape.getLineColor());
+ assertTrue(getSpPr(shape).getLn().isSetSolidFill());
+ shape.setLineColor(null);
+ assertNull(shape.getLineColor());
+ // setting dash width to null unsets the SolidFill element
+ assertFalse(getSpPr(shape).getLn().isSetSolidFill());
+
+ XSLFSimpleShape ln2 = slide.createAutoShape();
+ ln2.setLineDash(LineDash.DOT);
+ assertEquals(LineDash.DOT, ln2.getLineDash());
+ ln2.setLineWidth(0.);
+ assertEquals(0., ln2.getLineWidth(), 0);
+
+ XSLFSimpleShape ln3 = slide.createAutoShape();
+ ln3.setLineWidth(1.);
+ assertEquals(1., ln3.getLineWidth(), 0);
+ ln3.setLineDash(null);
+ assertNull(ln3.getLineDash());
+ ln3.setLineCap(null);
+ assertNull(ln3.getLineDash());
+ }
}
@Test
public void testFill() throws IOException {
- XMLSlideShow ppt = new XMLSlideShow();
- XSLFSlide slide = ppt.createSlide();
-
- XSLFAutoShape shape = slide.createAutoShape();
- // line properties are not set by default
- assertFalse(getSpPr(shape).isSetSolidFill());
-
- assertNull(shape.getFillColor());
- shape.setFillColor(null);
- assertNull(shape.getFillColor());
- assertFalse(getSpPr(shape).isSetSolidFill());
-
- shape.setFillColor(Color.RED);
- assertEquals(Color.RED, shape.getFillColor());
- shape.setFillColor(Color.DARK_GRAY);
- assertEquals(Color.DARK_GRAY, shape.getFillColor());
- assertTrue(getSpPr(shape).isSetSolidFill());
-
- shape.setFillColor(null);
- assertNull(shape.getFillColor());
- assertFalse(getSpPr(shape).isSetSolidFill());
- ppt.close();
+ try (XMLSlideShow ppt = new XMLSlideShow()) {
+ XSLFSlide slide = ppt.createSlide();
+
+ XSLFAutoShape shape = slide.createAutoShape();
+ // line properties are not set by default
+ assertFalse(getSpPr(shape).isSetSolidFill());
+
+ assertNull(shape.getFillColor());
+ shape.setFillColor(null);
+ assertNull(shape.getFillColor());
+ assertFalse(getSpPr(shape).isSetSolidFill());
+
+ shape.setFillColor(Color.RED);
+ assertEquals(Color.RED, shape.getFillColor());
+ shape.setFillColor(Color.DARK_GRAY);
+ assertEquals(Color.DARK_GRAY, shape.getFillColor());
+ assertTrue(getSpPr(shape).isSetSolidFill());
+
+ shape.setFillColor(null);
+ assertNull(shape.getFillColor());
+ assertFalse(getSpPr(shape).isSetSolidFill());
+ }
}
@Test
public void testDefaultProperties() throws IOException {
- XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("shapes.pptx");
-
- XSLFSlide slide6 = ppt.getSlides().get(5);
- List<XSLFShape> shapes = slide6.getShapes();
- for(XSLFShape xs : shapes){
- XSLFSimpleShape s = (XSLFSimpleShape)xs;
- // all shapes have a theme color="accent1"
- assertEquals("accent1", s.getSpStyle().getFillRef().getSchemeClr().getVal().toString());
- assertEquals(2.0, s.getLineWidth(), 0);
- assertEquals(LineCap.FLAT, s.getLineCap());
- assertEquals(new Color(79,129,189), s.getLineColor());
- }
+ try (XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("shapes.pptx")) {
+ XSLFSlide slide6 = ppt.getSlides().get(5);
+ List<XSLFShape> shapes = slide6.getShapes();
+ for (XSLFShape xs : shapes) {
+ XSLFSimpleShape s = (XSLFSimpleShape) xs;
+ // all shapes have a theme color="accent1"
+ assertEquals("accent1", s.getSpStyle().getFillRef().getSchemeClr().getVal().toString());
+ assertEquals(2.0, s.getLineWidth(), 0);
+ assertEquals(LineCap.FLAT, s.getLineCap());
+ assertEquals(new Color(79, 129, 189), s.getLineColor());
+ }
- XSLFSimpleShape s0 = (XSLFSimpleShape) shapes.get(0);
- // fill is not set
- assertNull(getSpPr(s0).getSolidFill());
- //assertEquals(slide6.getTheme().getColor("accent1").getColor(), s0.getFillColor());
- assertEquals(new Color(79, 129, 189), s0.getFillColor());
-
- // lighter 80%
- XSLFSimpleShape s1 = (XSLFSimpleShape)shapes.get(1);
- CTSchemeColor ref1 = getSpPr(s1).getSolidFill().getSchemeClr();
- assertEquals(1, ref1.sizeOfLumModArray());
- assertEquals(1, ref1.sizeOfLumOffArray());
- assertEquals(20000, ref1.getLumModArray(0).getVal());
- assertEquals(80000, ref1.getLumOffArray(0).getVal());
- assertEquals("accent1", ref1.getVal().toString());
- assertEquals(new Color(220, 230, 242), s1.getFillColor());
-
- // lighter 60%
- XSLFSimpleShape s2 = (XSLFSimpleShape)shapes.get(2);
- CTSchemeColor ref2 = getSpPr(s2).getSolidFill().getSchemeClr();
- assertEquals(1, ref2.sizeOfLumModArray());
- assertEquals(1, ref2.sizeOfLumOffArray());
- assertEquals(40000, ref2.getLumModArray(0).getVal());
- assertEquals(60000, ref2.getLumOffArray(0).getVal());
- assertEquals("accent1", ref2.getVal().toString());
- assertEquals(new Color(185, 205, 229), s2.getFillColor());
-
- // lighter 40%
- XSLFSimpleShape s3 = (XSLFSimpleShape)shapes.get(3);
- CTSchemeColor ref3 = getSpPr(s3).getSolidFill().getSchemeClr();
- assertEquals(1, ref3.sizeOfLumModArray());
- assertEquals(1, ref3.sizeOfLumOffArray());
- assertEquals(60000, ref3.getLumModArray(0).getVal());
- assertEquals(40000, ref3.getLumOffArray(0).getVal());
- assertEquals("accent1", ref3.getVal().toString());
- assertEquals(new Color(149, 179, 215), s3.getFillColor());
-
- // darker 25%
- XSLFSimpleShape s4 = (XSLFSimpleShape)shapes.get(4);
- CTSchemeColor ref4 = getSpPr(s4).getSolidFill().getSchemeClr();
- assertEquals(1, ref4.sizeOfLumModArray());
- assertEquals(0, ref4.sizeOfLumOffArray());
- assertEquals(75000, ref4.getLumModArray(0).getVal());
- assertEquals("accent1", ref3.getVal().toString());
- assertEquals(new Color(55, 96, 146), s4.getFillColor());
-
- XSLFSimpleShape s5 = (XSLFSimpleShape)shapes.get(5);
- CTSchemeColor ref5 = getSpPr(s5).getSolidFill().getSchemeClr();
- assertEquals(1, ref5.sizeOfLumModArray());
- assertEquals(0, ref5.sizeOfLumOffArray());
- assertEquals(50000, ref5.getLumModArray(0).getVal());
- assertEquals("accent1", ref5.getVal().toString());
- assertEquals(new Color(37, 64, 97), s5.getFillColor());
-
- ppt.close();
+ XSLFSimpleShape s0 = (XSLFSimpleShape) shapes.get(0);
+ // fill is not set
+ assertNull(getSpPr(s0).getSolidFill());
+ //assertEquals(slide6.getTheme().getColor("accent1").getColor(), s0.getFillColor());
+ assertEquals(new Color(79, 129, 189), s0.getFillColor());
+
+ // lighter 80%
+ XSLFSimpleShape s1 = (XSLFSimpleShape) shapes.get(1);
+ CTSchemeColor ref1 = getSpPr(s1).getSolidFill().getSchemeClr();
+ assertEquals(1, ref1.sizeOfLumModArray());
+ assertEquals(1, ref1.sizeOfLumOffArray());
+ assertEquals(20000, ref1.getLumModArray(0).getVal());
+ assertEquals(80000, ref1.getLumOffArray(0).getVal());
+ assertEquals("accent1", ref1.getVal().toString());
+ assertEquals(new Color(220, 230, 242), s1.getFillColor());
+
+ // lighter 60%
+ XSLFSimpleShape s2 = (XSLFSimpleShape) shapes.get(2);
+ CTSchemeColor ref2 = getSpPr(s2).getSolidFill().getSchemeClr();
+ assertEquals(1, ref2.sizeOfLumModArray());
+ assertEquals(1, ref2.sizeOfLumOffArray());
+ assertEquals(40000, ref2.getLumModArray(0).getVal());
+ assertEquals(60000, ref2.getLumOffArray(0).getVal());
+ assertEquals("accent1", ref2.getVal().toString());
+ assertEquals(new Color(185, 205, 229), s2.getFillColor());
+
+ // lighter 40%
+ XSLFSimpleShape s3 = (XSLFSimpleShape) shapes.get(3);
+ CTSchemeColor ref3 = getSpPr(s3).getSolidFill().getSchemeClr();
+ assertEquals(1, ref3.sizeOfLumModArray());
+ assertEquals(1, ref3.sizeOfLumOffArray());
+ assertEquals(60000, ref3.getLumModArray(0).getVal());
+ assertEquals(40000, ref3.getLumOffArray(0).getVal());
+ assertEquals("accent1", ref3.getVal().toString());
+ assertEquals(new Color(149, 179, 215), s3.getFillColor());
+
+ // darker 25%
+ XSLFSimpleShape s4 = (XSLFSimpleShape) shapes.get(4);
+ CTSchemeColor ref4 = getSpPr(s4).getSolidFill().getSchemeClr();
+ assertEquals(1, ref4.sizeOfLumModArray());
+ assertEquals(0, ref4.sizeOfLumOffArray());
+ assertEquals(75000, ref4.getLumModArray(0).getVal());
+ assertEquals("accent1", ref3.getVal().toString());
+ assertEquals(new Color(55, 96, 146), s4.getFillColor());
+
+ XSLFSimpleShape s5 = (XSLFSimpleShape) shapes.get(5);
+ CTSchemeColor ref5 = getSpPr(s5).getSolidFill().getSchemeClr();
+ assertEquals(1, ref5.sizeOfLumModArray());
+ assertEquals(0, ref5.sizeOfLumOffArray());
+ assertEquals(50000, ref5.getLumModArray(0).getVal());
+ assertEquals("accent1", ref5.getVal().toString());
+ assertEquals(new Color(37, 64, 97), s5.getFillColor());
+ }
}
@Test
public void testAnchor() throws IOException {
- XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("shapes.pptx");
- List<XSLFSlide> slide = ppt.getSlides();
-
- XSLFSlide slide2 = slide.get(1);
- XSLFSlideLayout layout2 = slide2.getSlideLayout();
- List<XSLFShape> shapes2 = slide2.getShapes();
- XSLFTextShape sh1 = (XSLFTextShape)shapes2.get(0);
- assertEquals(Placeholder.CENTERED_TITLE, sh1.getTextType());
- assertEquals("PPTX Title", sh1.getText());
- assertFalse(getSpPr(sh1).isSetXfrm()); // xfrm is not set, the query is delegated to the slide layout
- assertEquals(sh1.getAnchor(), layout2.getTextShapeByType(Placeholder.CENTERED_TITLE).getAnchor());
-
- XSLFTextShape sh2 = (XSLFTextShape)shapes2.get(1);
- assertEquals("Subtitle\nAnd second line", sh2.getText());
- assertEquals(Placeholder.SUBTITLE, sh2.getTextType());
- assertFalse(getSpPr(sh2).isSetXfrm()); // xfrm is not set, the query is delegated to the slide layout
- assertEquals(sh2.getAnchor(), layout2.getTextShapeByType(Placeholder.SUBTITLE).getAnchor());
-
- XSLFSlide slide5 = slide.get(4);
- XSLFSlideLayout layout5 = slide5.getSlideLayout();
- XSLFTextShape shTitle = slide5.getTextShapeByType(Placeholder.TITLE);
- assertEquals("Hyperlinks", shTitle.getText());
- // xfrm is not set, the query is delegated to the slide layout
- assertFalse(getSpPr(shTitle).isSetXfrm());
- // xfrm is not set, the query is delegated to the slide master
- assertFalse(getSpPr(layout5.getTextShapeByType(Placeholder.TITLE)).isSetXfrm());
- assertTrue(getSpPr(layout5.getSlideMaster().getTextShapeByType(Placeholder.TITLE)).isSetXfrm());
- assertEquals(shTitle.getAnchor(), layout5.getSlideMaster().getTextShapeByType(Placeholder.TITLE).getAnchor());
-
- ppt.close();
- }
-
- @SuppressWarnings("unused")
- @Test
- public void testShadowEffects() throws IOException{
- XMLSlideShow ppt = new XMLSlideShow();
- XSLFSlide slide = ppt.createSlide();
- CTStyleMatrix styleMatrix = slide.getTheme().getXmlObject().getThemeElements().getFmtScheme();
- CTEffectStyleList lst = styleMatrix.getEffectStyleLst();
- assertNotNull(lst);
- for(CTEffectStyleItem ef : lst.getEffectStyleArray()){
- CTOuterShadowEffect obj = ef.getEffectLst().getOuterShdw();
+ try (XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("shapes.pptx")) {
+ List<XSLFSlide> slide = ppt.getSlides();
+
+ XSLFSlide slide2 = slide.get(1);
+ XSLFSlideLayout layout2 = slide2.getSlideLayout();
+ List<XSLFShape> shapes2 = slide2.getShapes();
+ XSLFTextShape sh1 = (XSLFTextShape) shapes2.get(0);
+ assertEquals(Placeholder.CENTERED_TITLE, sh1.getTextType());
+ assertEquals("PPTX Title", sh1.getText());
+ assertFalse(getSpPr(sh1).isSetXfrm()); // xfrm is not set, the query is delegated to the slide layout
+ assertEquals(sh1.getAnchor(), layout2.getTextShapeByType(Placeholder.CENTERED_TITLE).getAnchor());
+
+ XSLFTextShape sh2 = (XSLFTextShape) shapes2.get(1);
+ assertEquals("Subtitle\nAnd second line", sh2.getText());
+ assertEquals(Placeholder.SUBTITLE, sh2.getTextType());
+ assertFalse(getSpPr(sh2).isSetXfrm()); // xfrm is not set, the query is delegated to the slide layout
+ assertEquals(sh2.getAnchor(), layout2.getTextShapeByType(Placeholder.SUBTITLE).getAnchor());
+
+ XSLFSlide slide5 = slide.get(4);
+ XSLFSlideLayout layout5 = slide5.getSlideLayout();
+ XSLFTextShape shTitle = slide5.getTextShapeByType(Placeholder.TITLE);
+ assertEquals("Hyperlinks", shTitle.getText());
+ // xfrm is not set, the query is delegated to the slide layout
+ assertFalse(getSpPr(shTitle).isSetXfrm());
+ // xfrm is not set, the query is delegated to the slide master
+ assertFalse(getSpPr(layout5.getTextShapeByType(Placeholder.TITLE)).isSetXfrm());
+ assertTrue(getSpPr(layout5.getSlideMaster().getTextShapeByType(Placeholder.TITLE)).isSetXfrm());
+ assertEquals(shTitle.getAnchor(), layout5.getSlideMaster().getTextShapeByType(Placeholder.TITLE).getAnchor());
}
- ppt.close();
- }
-
- @Test
- public void testValidGeometry() throws Exception {
- XMLSlideShow ppt = new XMLSlideShow();
- XSLFSlide slide = ppt.createSlide();
-
- XSLFSimpleShape shape = slide.createAutoShape();
- CTShapeProperties spPr = getSpPr(shape);
-
- CTPresetGeometry2D prstGeom = CTPresetGeometry2D.Factory.newInstance();
- prstGeom.setPrst(STShapeType.Enum.forInt(1));
-
- assertNotNull(prstGeom.getPrst());
- assertNotNull(prstGeom.getPrst().toString());
- assertNotNull(spPr.getPrstGeom());
- spPr.setPrstGeom(prstGeom);
- assertNotNull(spPr.getPrstGeom().getPrst());
- assertNotNull(spPr.getPrstGeom().getPrst().toString());
-
- assertNotNull(shape.getGeometry());
-
- ppt.close();
}
-
+ @SuppressWarnings({"unused", "deprecation"})
@Test
- public void testInvalidGeometry() throws Exception {
- XMLSlideShow ppt = new XMLSlideShow();
- XSLFSlide slide = ppt.createSlide();
-
- XSLFSimpleShape shape = slide.createAutoShape();
- CTShapeProperties spPr = getSpPr(shape);
-
- CTPresetGeometry2D prstGeom = CTPresetGeometry2D.Factory.newInstance();
- prstGeom.setPrst(STShapeType.Enum.forInt(1));
-
- assertNotNull(prstGeom.getPrst());
- assertNotNull(prstGeom.getPrst().toString());
- assertNotNull(spPr.getPrstGeom());
- spPr.setPrstGeom(prstGeom);
- assertNotNull(spPr.getPrstGeom().getPrst());
- assertNotNull(spPr.getPrstGeom().getPrst().toString());
-
- try {
- // cause the geometries to be not found
- TestPresetGeometries.clearPreset();
- try {
- shape.getGeometry();
- fail("Should fail without the geometry");
- } catch (IllegalStateException e) {
- assertTrue(e.getMessage(), e.getMessage().contains("line"));
+ public void testShadowEffects() throws IOException{
+ try (XMLSlideShow ppt = new XMLSlideShow()) {
+ XSLFSlide slide = ppt.createSlide();
+ CTStyleMatrix styleMatrix = slide.getTheme().getXmlObject().getThemeElements().getFmtScheme();
+ CTEffectStyleList lst = styleMatrix.getEffectStyleLst();
+ assertNotNull(lst);
+ for (CTEffectStyleItem ef : lst.getEffectStyleArray()) {
+ CTOuterShadowEffect obj = ef.getEffectLst().getOuterShdw();
}
- } finally {
- // reset to not affect other tests
- TestPresetGeometries.resetPreset();
}
-
- ppt.close();
}
- @SuppressWarnings("Duplicates")
@Test
- public void testArrayStoreException() throws IOException {
- XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("aascu.org_workarea_downloadasset.aspx_id=5864.pptx");
- Dimension pgsize = ppt.getPageSize();
-
- for (Slide<?,?> s : ppt.getSlides()) {
- //System.out.println("Slide: " + s);
+ public void testValidGeometry() throws Exception {
+ try (XMLSlideShow ppt = new XMLSlideShow()) {
+ XSLFSlide slide = ppt.createSlide();
- BufferedImage img = new BufferedImage(pgsize.width, pgsize.height, BufferedImage.TYPE_INT_ARGB);
- Graphics2D graphics = img.createGraphics();
+ XSLFSimpleShape shape = slide.createAutoShape();
+ CTShapeProperties spPr = getSpPr(shape);
- // default rendering options
- graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
- graphics.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
- graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
- graphics.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
+ CTPresetGeometry2D prstGeom = CTPresetGeometry2D.Factory.newInstance();
+ prstGeom.setPrst(STShapeType.Enum.forInt(1));
- // draw stuff
- s.draw(graphics);
+ assertNotNull(prstGeom.getPrst());
+ assertNotNull(prstGeom.getPrst().toString());
+ assertNotNull(spPr.getPrstGeom());
+ spPr.setPrstGeom(prstGeom);
+ assertNotNull(spPr.getPrstGeom().getPrst());
+ assertNotNull(spPr.getPrstGeom().getPrst().toString());
- graphics.dispose();
- img.flush();
+ assertNotNull(shape.getGeometry());
}
- ppt.close();
}
-
+
+ @Test
+ public void testArrayStoreException() throws Exception {
+ File file = POIDataSamples.getSlideShowInstance().getFile("aascu.org_workarea_downloadasset.aspx_id=5864.pptx");
+ String[] args = {
+ "-format", "null", // png,gif,jpg,svg or null for test
+ "-slide", "-1", // -1 for all
+ "-outdir", new File("build/tmp/").getCanonicalPath(),
+ "-quiet",
+ "-fixside", "long",
+ "-scale", "800",
+ file.getAbsolutePath()
+ };
+ PPTX2PNG.main(args);
+ }
+
static CTShapeProperties getSpPr(XSLFShape shape) {
XmlObject xo = shape.getShapeProperties();
assertTrue(xo instanceof CTShapeProperties);
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFAutoShape.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFAutoShape.java
index b10a6a52d5..88a90cbba0 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFAutoShape.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFAutoShape.java
@@ -25,23 +25,20 @@ import java.awt.geom.Path2D;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import java.util.Iterator;
-import java.util.List;
import org.apache.poi.ddf.AbstractEscherOptRecord;
import org.apache.poi.ddf.EscherArrayProperty;
import org.apache.poi.ddf.EscherContainerRecord;
import org.apache.poi.ddf.EscherPropertyTypes;
import org.apache.poi.ddf.EscherSimpleProperty;
-import org.apache.poi.sl.draw.binding.CTAdjPoint2D;
-import org.apache.poi.sl.draw.binding.CTCustomGeometry2D;
-import org.apache.poi.sl.draw.binding.CTPath2D;
-import org.apache.poi.sl.draw.binding.CTPath2DArcTo;
-import org.apache.poi.sl.draw.binding.CTPath2DCubicBezierTo;
-import org.apache.poi.sl.draw.binding.CTPath2DLineTo;
-import org.apache.poi.sl.draw.binding.CTPath2DList;
-import org.apache.poi.sl.draw.binding.CTPath2DMoveTo;
-import org.apache.poi.sl.draw.binding.ObjectFactory;
+import org.apache.poi.sl.draw.geom.AdjustPoint;
+import org.apache.poi.sl.draw.geom.ArcToCommand;
+import org.apache.poi.sl.draw.geom.ClosePathCommand;
+import org.apache.poi.sl.draw.geom.CurveToCommand;
import org.apache.poi.sl.draw.geom.CustomGeometry;
+import org.apache.poi.sl.draw.geom.LineToCommand;
+import org.apache.poi.sl.draw.geom.MoveToCommand;
+import org.apache.poi.sl.draw.geom.Path;
import org.apache.poi.sl.usermodel.AutoShape;
import org.apache.poi.sl.usermodel.ShapeContainer;
import org.apache.poi.sl.usermodel.ShapeType;
@@ -72,7 +69,6 @@ public class HSLFAutoShape extends HSLFTextShape implements AutoShape<HSLFShape,
static final byte[] SEGMENTINFO_CLOSE = new byte[]{0x01, (byte)0x60};
static final byte[] SEGMENTINFO_END = new byte[]{0x00, (byte)0x80};
- private static final ObjectFactory OF = new ObjectFactory();
private static final BitField PATH_INFO = BitFieldFactory.getInstance(0xE000);
private static final BitField ESCAPE_INFO = BitFieldFactory.getInstance(0x1F00);
@@ -211,11 +207,7 @@ public class HSLFAutoShape extends HSLFTextShape implements AutoShape<HSLFShape,
}
CustomGeometry getGeometry(Path2D path2D) {
- final CTCustomGeometry2D cusGeo = OF.createCTCustomGeometry2D();
- cusGeo.setAvLst(OF.createCTGeomGuideList());
- cusGeo.setGdLst(OF.createCTGeomGuideList());
- cusGeo.setAhLst(OF.createCTAdjustHandleList());
- cusGeo.setCxnLst(OF.createCTConnectionSiteList());
+ final CustomGeometry cusGeo = new CustomGeometry();
final AbstractEscherOptRecord opt = getEscherOptRecord();
@@ -239,11 +231,8 @@ public class HSLFAutoShape extends HSLFTextShape implements AutoShape<HSLFShape,
final int[] xyPoints = new int[2];
boolean isClosed = false;
- final CTPath2DList pathLst = OF.createCTPath2DList();
- final CTPath2D pathCT = OF.createCTPath2D();
- final List<Object> moveLst = pathCT.getCloseOrMoveToOrLnTo();
- pathLst.getPath().add(pathCT);
- cusGeo.setPathLst(pathLst);
+ final Path path = new Path();
+ cusGeo.addPath(path);
while (segIter.hasNext()) {
byte[] segElem = segIter.next();
@@ -253,20 +242,20 @@ public class HSLFAutoShape extends HSLFTextShape implements AutoShape<HSLFShape,
}
switch (pi) {
case escape:
- handleEscapeInfo(pathCT, path2D, segElem, vertIter);
+ handleEscapeInfo(path, path2D, segElem, vertIter);
break;
case moveTo:
- handleMoveTo(vertIter, xyPoints, moveLst, path2D);
+ handleMoveTo(vertIter, xyPoints, path, path2D);
break;
case lineTo:
- handleLineTo(vertIter, xyPoints, moveLst, path2D);
+ handleLineTo(vertIter, xyPoints, path, path2D);
break;
case curveTo:
- handleCurveTo(vertIter, xyPoints, moveLst, path2D);
+ handleCurveTo(vertIter, xyPoints, path, path2D);
break;
case close:
if (path2D.getCurrentPoint() != null) {
- moveLst.add(OF.createCTPath2DClose());
+ path.addCommand(new ClosePathCommand());
path2D.closePath();
}
isClosed = true;
@@ -277,15 +266,15 @@ public class HSLFAutoShape extends HSLFTextShape implements AutoShape<HSLFShape,
}
if (!isClosed) {
- handleClosedShape(opt, moveLst, path2D);
+ handleClosedShape(opt, path, path2D);
}
final Rectangle2D bounds = getBounds(opt, path2D);
- pathCT.setW((int)Math.rint(bounds.getWidth()));
- pathCT.setH((int)Math.rint(bounds.getHeight()));
+ path.setW((int)Math.rint(bounds.getWidth()));
+ path.setH((int)Math.rint(bounds.getHeight()));
- return new CustomGeometry(cusGeo);
+ return cusGeo;
}
private static Rectangle2D getBounds(AbstractEscherOptRecord opt, Path2D path2D) {
@@ -306,76 +295,79 @@ public class HSLFAutoShape extends HSLFTextShape implements AutoShape<HSLFShape,
}
}
- private static void handleClosedShape(AbstractEscherOptRecord opt, List<Object> moveLst, Path2D path2D) {
+ private static void handleClosedShape(AbstractEscherOptRecord opt, Path path, Path2D path2D) {
EscherSimpleProperty shapePath = getEscherProperty(opt, EscherPropertyTypes.GEOMETRY__SHAPEPATH);
HSLFFreeformShape.ShapePath sp = HSLFFreeformShape.ShapePath.valueOf(shapePath == null ? 1 : shapePath.getPropertyValue());
if (sp == LINES_CLOSED || sp == CURVES_CLOSED) {
- moveLst.add(OF.createCTPath2DClose());
+ path.addCommand(new ClosePathCommand());
path2D.closePath();
}
}
- private static void handleMoveTo(Iterator<byte[]> vertIter, int[] xyPoints, List<Object> moveLst, Path2D path2D) {
+ private static void handleMoveTo(Iterator<byte[]> vertIter, int[] xyPoints, Path path, Path2D path2D) {
if (!vertIter.hasNext()) {
return;
}
- final CTPath2DMoveTo m = OF.createCTPath2DMoveTo();
+ final MoveToCommand m = new MoveToCommand();
m.setPt(fillPoint(vertIter.next(), xyPoints));
- moveLst.add(m);
+ path.addCommand(m);
path2D.moveTo(xyPoints[0], xyPoints[1]);
}
- private static void handleLineTo(Iterator<byte[]> vertIter, int[] xyPoints, List<Object> moveLst, Path2D path2D) {
+ private static void handleLineTo(Iterator<byte[]> vertIter, int[] xyPoints, Path path, Path2D path2D) {
if (!vertIter.hasNext()) {
return;
}
- handleMoveTo0(moveLst, path2D);
+ handleMoveTo0(path, path2D);
- final CTPath2DLineTo m = OF.createCTPath2DLineTo();
+ final LineToCommand m = new LineToCommand();
m.setPt(fillPoint(vertIter.next(), xyPoints));
- moveLst.add(m);
+ path.addCommand(m);
path2D.lineTo(xyPoints[0], xyPoints[1]);
}
- private static void handleCurveTo(Iterator<byte[]> vertIter, int[] xyPoints, List<Object> moveLst, Path2D path2D) {
+ private static void handleCurveTo(Iterator<byte[]> vertIter, int[] xyPoints, Path path, Path2D path2D) {
if (!vertIter.hasNext()) {
return;
}
- handleMoveTo0(moveLst, path2D);
+ handleMoveTo0(path, path2D);
- final CTPath2DCubicBezierTo m = OF.createCTPath2DCubicBezierTo();
- List<CTAdjPoint2D> mLst = m.getPt();
+ final CurveToCommand m = new CurveToCommand();
int[] pts = new int[6];
+ AdjustPoint[] ap = new AdjustPoint[3];
for (int i=0; vertIter.hasNext() && i<3; i++) {
- mLst.add(fillPoint(vertIter.next(), xyPoints));
+ ap[i] = fillPoint(vertIter.next(), xyPoints);
pts[i*2] = xyPoints[0];
pts[i*2+1] = xyPoints[1];
- if (i == 2) {
- moveLst.add(m);
- path2D.curveTo(pts[0], pts[1], pts[2], pts[3], pts[4], pts[5]);
- }
}
+
+ m.setPt1(ap[0]);
+ m.setPt2(ap[1]);
+ m.setPt3(ap[2]);
+
+ path.addCommand(m);
+ path2D.curveTo(pts[0], pts[1], pts[2], pts[3], pts[4], pts[5]);
}
/**
* Sometimes the path2D is not initialized - this initializes it with the 0,0 position
*/
- private static void handleMoveTo0(List<Object> moveLst, Path2D path2D) {
+ private static void handleMoveTo0(Path moveLst, Path2D path2D) {
if (path2D.getCurrentPoint() == null) {
- final CTPath2DMoveTo m = OF.createCTPath2DMoveTo();
+ final MoveToCommand m = new MoveToCommand();
- CTAdjPoint2D pt = OF.createCTAdjPoint2D();
+ AdjustPoint pt = new AdjustPoint();
pt.setX("0");
pt.setY("0");
m.setPt(pt);
- moveLst.add(m);
+ moveLst.addCommand(m);
path2D.moveTo(0, 0);
}
}
- private static void handleEscapeInfo(CTPath2D pathCT, Path2D path2D, byte[] segElem, Iterator<byte[]> vertIter) {
+ private static void handleEscapeInfo(Path pathCT, Path2D path2D, byte[] segElem, Iterator<byte[]> vertIter) {
HSLFAutoShape.EscapeInfo ei = getEscapeInfo(segElem);
if (ei == null) {
return;
@@ -412,14 +404,14 @@ public class HSLFAutoShape extends HSLFTextShape implements AutoShape<HSLFShape,
path2D.append(arc2D, true);
- CTPath2DArcTo arcTo = OF.createCTPath2DArcTo();
+ ArcToCommand arcTo = new ArcToCommand();
arcTo.setHR(d2s(bounds.getHeight()/2.0));
arcTo.setWR(d2s(bounds.getWidth()/2.0));
arcTo.setStAng(d2s(-arc2D.getAngleStart()*60000.));
arcTo.setSwAng(d2s(-arc2D.getAngleExtent()*60000.));
- pathCT.getCloseOrMoveToOrLnTo().add(arcTo);
+ pathCT.addCommand(arcTo);
break;
}
@@ -487,7 +479,7 @@ public class HSLFAutoShape extends HSLFTextShape implements AutoShape<HSLFShape,
}
- private static CTAdjPoint2D fillPoint(byte[] xyMaster, int[] xyPoints) {
+ private static AdjustPoint fillPoint(byte[] xyMaster, int[] xyPoints) {
if (xyMaster == null || xyPoints == null) {
LOG.log(POILogger.WARN, "Master bytes or points not set - ignore point");
return null;
@@ -512,8 +504,8 @@ public class HSLFAutoShape extends HSLFTextShape implements AutoShape<HSLFShape,
return toPoint(xyPoints);
}
- private static CTAdjPoint2D toPoint(int[] xyPoints) {
- CTAdjPoint2D pt = OF.createCTAdjPoint2D();
+ private static AdjustPoint toPoint(int[] xyPoints) {
+ AdjustPoint pt = new AdjustPoint();
pt.setX(Integer.toString(xyPoints[0]));
pt.setY(Integer.toString(xyPoints[1]));
return pt;
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java
index 097342ffe8..6e8c3699a7 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java
@@ -368,7 +368,10 @@ public abstract class HSLFSimpleShape extends HSLFShape implements SimpleShape<H
break;
}
- return new Guide(name, "val "+Math.rint(adjval * (isDegreeUnit ? 65536. : 100000./21000.)));
+ Guide gd = new Guide();
+ gd.setName(name);
+ gd.setFmla("val "+Math.rint(adjval * (isDegreeUnit ? 65536. : 100000./21000.)));
+ return gd;
}
@Override
diff --git a/src/testcases/org/apache/poi/sl/draw/geom/TestPresetGeometries.java b/src/testcases/org/apache/poi/sl/draw/geom/TestPresetGeometries.java
index 8b583e44df..fe57570c5d 100644
--- a/src/testcases/org/apache/poi/sl/draw/geom/TestPresetGeometries.java
+++ b/src/testcases/org/apache/poi/sl/draw/geom/TestPresetGeometries.java
@@ -21,13 +21,11 @@ package org.apache.poi.sl.draw.geom;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
import java.awt.geom.Path2D;
import java.awt.geom.Rectangle2D;
import java.net.URL;
import java.util.Enumeration;
-import java.util.Map;
import org.junit.Ignore;
import org.junit.Test;
@@ -35,8 +33,9 @@ import org.junit.Test;
public class TestPresetGeometries {
@Test
public void testRead(){
- Map<String, CustomGeometry> shapes = PresetGeometries.getInstance();
+ PresetGeometries shapes = PresetGeometries.getInstance();
assertEquals(187, shapes.size());
+ assertEquals(0x4533584F, shapes.hashCode());
for(String name : shapes.keySet()) {
CustomGeometry geom = shapes.get(name);
@@ -46,30 +45,17 @@ public class TestPresetGeometries {
assertNotNull(path);
}
}
-
+
// we get the same instance on further calls
assertSame(shapes, PresetGeometries.getInstance());
}
- // helper methods to adjust list of presets for other tests
- public static void clearPreset() {
- // ensure that we are initialized
- assertNotNull(PresetGeometries.getInstance());
-
- // test handling if some presets are not found
- PresetGeometries._inst.clear();
- }
-
- public static void resetPreset() {
- PresetGeometries._inst = null;
- }
-
@Ignore("problem solved? Turn back on if this debugging is still in process.")
@Test
public void testCheckXMLParser() throws Exception{
- // Gump reports a strange error because of an unavailable XML Parser, let's try to find out where
+ // Gump reports a strange error because of an unavailable XML Parser, let's try to find out where
// this comes from
- //
+ //
Enumeration<URL> resources = this.getClass().getClassLoader().getResources("META-INF/services/javax.xml.stream.XMLEventFactory");
printURLs(resources);
resources = ClassLoader.getSystemResources("META-INF/services/javax.xml.stream.XMLEventFactory");