Author: kiwiwings
Date: Sun Feb 11 22:09:58 2018
New Revision: 1823910
URL: http://svn.apache.org/viewvc?rev=1823910&view=rev
Log:
Update JAXB classes with fixed javadocs for java 8 doclint
Added:
poi/trunk/src/java/org/apache/poi/sl/draw/binding/package-info.java (with
props)
Modified:
poi/trunk/build.xml
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTAdjPoint2D.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTAdjustHandleList.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTAngle.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTColor.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTColorMRU.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTComplementTransform.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTConnection.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTConnectionSite.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTConnectionSiteList.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTCustomGeometry2D.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTEmbeddedWAVAudioFile.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTFixedPercentage.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGammaTransform.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGeomGuide.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGeomGuideList.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGeomRect.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGrayscaleTransform.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGroupTransform2D.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTHslColor.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTHyperlink.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTInverseGammaTransform.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTInverseTransform.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTOfficeArtExtension.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTOfficeArtExtensionList.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2D.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DArcTo.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DClose.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DCubicBezierTo.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DLineTo.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DList.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DMoveTo.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DQuadBezierTo.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPercentage.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPoint2D.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPoint3D.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPolarAdjustHandle.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedAngle.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedPercentage.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositivePercentage.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositiveSize2D.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPresetColor.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPresetGeometry2D.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPresetTextShape.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTRatio.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTRelativeRect.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSRgbColor.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTScRgbColor.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTScale2D.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSchemeColor.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSphereCoords.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSystemColor.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTTransform2D.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTVector3D.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTXYAdjustHandle.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/ObjectFactory.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/STBlackWhiteMode.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/STPathFillMode.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/STPresetColorVal.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/STRectAlignment.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/STSchemeColorVal.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/STShapeType.java
poi/trunk/src/java/org/apache/poi/sl/draw/binding/STTextShapeType.java
Modified: poi/trunk/build.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1823910&r1=1823909&r2=1823910&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Sun Feb 11 22:09:58 2018
@@ -965,8 +965,6 @@ under the License.
<target name="generate-geometry" depends="fetch-ooxml-xsds" if="ignoreme">
<delete dir="${geometry.output.tmpdir}"/>
- <!-- taskdef xjc -->
- <!-- "D:\Program Files\Java\jdk1.6.0_45\bin\xjc" -p
org.apache.poi.sl.model.geom.binding -readOnly -Xlocator -mark-generated
ooxml-schemas\dml-shapeGeometry.xsd -->
<unzip src="${ooxml.lib}/${ooxml.xsds.izip.1}"
dest="${geometry.output.tmpdir}"/>
<exec executable="${env.JAVA_HOME}/bin/xjc">
<arg value="-p"/>
@@ -974,8 +972,8 @@ under the License.
<arg value="-b"/>
<arg file="src/types/definitions/dml-shapeGeometry.xjb"/>
<arg value="-readOnly"/>
- <arg value="-npa"/>
<arg value="-no-header"/>
+ <!--arg value="-npa"/ -->
<!--arg value="-mark-generated"/ -->
<!--arg value="-Xlocator"/ -->
<arg file="${geometry.output.tmpdir}/dml-shapeGeometry.xsd"/>
@@ -991,6 +989,9 @@ under the License.
<fileset dir="${geometry.output.tmpdir}" includes="**/*.java"/>
<filterchain>
<concatfilter
prepend="${geometry.output.tmpdir}/apache-license.txt"/>
+ <!-- fix javadocs for java 8 doclint -->
+ <replaceregex pattern="&lt;(.*)>"
replace="&lt;\1&gt;" flags="g"/>
+ <fixcrlf eol="lf"/>
</filterchain>
</copy>
</target>
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTAdjPoint2D.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTAdjPoint2D.java?rev=1823910&r1=1823909&r2=1823910&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTAdjPoint2D.java
(original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTAdjPoint2D.java Sun Feb
11 22:09:58 2018
@@ -29,25 +29,25 @@ import javax.xml.bind.annotation.XmlType
* <p>The following schema fragment specifies the expected content contained
within this class.
*
* <pre>
- * <complexType name="CT_AdjPoint2D">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- * <attribute name="x" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate";
/>
- * <attribute name="y" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate";
/>
- * </restriction>
- * </complexContent>
- * </complexType>
+ * <complexType name="CT_AdjPoint2D">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <attribute name="x" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate";
/>
+ * <attribute name="y" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate";
/>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_AdjPoint2D", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
+@XmlType(name = "CT_AdjPoint2D")
public class CTAdjPoint2D {
- @XmlAttribute(required = true)
+ @XmlAttribute(name = "x", required = true)
protected String x;
- @XmlAttribute(required = true)
+ @XmlAttribute(name = "y", required = true)
protected String y;
/**
Modified:
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTAdjustHandleList.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTAdjustHandleList.java?rev=1823910&r1=1823909&r2=1823910&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTAdjustHandleList.java
(original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTAdjustHandleList.java
Sun Feb 11 22:09:58 2018
@@ -32,29 +32,29 @@ import javax.xml.bind.annotation.XmlType
* <p>The following schema fragment specifies the expected content contained
within this class.
*
* <pre>
- * <complexType name="CT_AdjustHandleList">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- * <choice maxOccurs="unbounded" minOccurs="0">
- * <element name="ahXY"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_XYAdjustHandle"/>
- * <element name="ahPolar"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_PolarAdjustHandle"/>
- * </choice>
- * </restriction>
- * </complexContent>
- * </complexType>
+ * <complexType name="CT_AdjustHandleList">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <choice maxOccurs="unbounded" minOccurs="0">
+ * <element name="ahXY"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_XYAdjustHandle"/>
+ * <element name="ahPolar"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_PolarAdjustHandle"/>
+ * </choice>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_AdjustHandleList", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = {
+@XmlType(name = "CT_AdjustHandleList", propOrder = {
"ahXYOrAhPolar"
})
public class CTAdjustHandleList {
@XmlElements({
- @XmlElement(name = "ahXY", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
CTXYAdjustHandle.class),
- @XmlElement(name = "ahPolar", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
CTPolarAdjustHandle.class)
+ @XmlElement(name = "ahXY", type = CTXYAdjustHandle.class),
+ @XmlElement(name = "ahPolar", type = CTPolarAdjustHandle.class)
})
protected List<Object> ahXYOrAhPolar;
@@ -83,7 +83,7 @@ public class CTAdjustHandleList {
*/
public List<Object> getAhXYOrAhPolar() {
if (ahXYOrAhPolar == null) {
- ahXYOrAhPolar = new ArrayList<>();
+ ahXYOrAhPolar = new ArrayList<Object>();
}
return this.ahXYOrAhPolar;
}
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTAngle.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTAngle.java?rev=1823910&r1=1823909&r2=1823910&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTAngle.java (original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTAngle.java Sun Feb 11
22:09:58 2018
@@ -29,22 +29,22 @@ import javax.xml.bind.annotation.XmlType
* <p>The following schema fragment specifies the expected content contained
within this class.
*
* <pre>
- * <complexType name="CT_Angle">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- * <attribute name="val" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Angle"; />
- * </restriction>
- * </complexContent>
- * </complexType>
+ * <complexType name="CT_Angle">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <attribute name="val" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Angle"; />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Angle", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
+@XmlType(name = "CT_Angle")
public class CTAngle {
- @XmlAttribute(required = true)
+ @XmlAttribute(name = "val", required = true)
protected int val;
/**
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTColor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTColor.java?rev=1823910&r1=1823909&r2=1823910&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTColor.java (original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTColor.java Sun Feb 11
22:09:58 2018
@@ -19,7 +19,6 @@ 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;
@@ -29,21 +28,21 @@ import javax.xml.bind.annotation.XmlType
* <p>The following schema fragment specifies the expected content contained
within this class.
*
* <pre>
- * <complexType name="CT_Color">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- * <sequence>
- * <group
ref="{http://schemas.openxmlformats.org/drawingml/2006/main}EG_ColorChoice"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
+ * <complexType name="CT_Color">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <group
ref="{http://schemas.openxmlformats.org/drawingml/2006/main}EG_ColorChoice"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Color", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = {
+@XmlType(name = "CT_Color", propOrder = {
"scrgbClr",
"srgbClr",
"hslClr",
@@ -53,17 +52,11 @@ import javax.xml.bind.annotation.XmlType
})
public class CTColor {
- @XmlElement(namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
protected CTScRgbColor scrgbClr;
- @XmlElement(namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
protected CTSRgbColor srgbClr;
- @XmlElement(namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
protected CTHslColor hslClr;
- @XmlElement(namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
protected CTSystemColor sysClr;
- @XmlElement(namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
protected CTSchemeColor schemeClr;
- @XmlElement(namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
protected CTPresetColor prstClr;
/**
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTColorMRU.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTColorMRU.java?rev=1823910&r1=1823909&r2=1823910&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTColorMRU.java (original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTColorMRU.java Sun Feb
11 22:09:58 2018
@@ -32,32 +32,32 @@ import javax.xml.bind.annotation.XmlType
* <p>The following schema fragment specifies the expected content contained
within this class.
*
* <pre>
- * <complexType name="CT_ColorMRU">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- * <sequence>
- * <group
ref="{http://schemas.openxmlformats.org/drawingml/2006/main}EG_ColorChoice";
maxOccurs="10" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
+ * <complexType name="CT_ColorMRU">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <group
ref="{http://schemas.openxmlformats.org/drawingml/2006/main}EG_ColorChoice";
maxOccurs="10" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_ColorMRU", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = {
+@XmlType(name = "CT_ColorMRU", propOrder = {
"egColorChoice"
})
public class CTColorMRU {
@XmlElements({
- @XmlElement(name = "prstClr", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
CTPresetColor.class),
- @XmlElement(name = "sysClr", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
CTSystemColor.class),
- @XmlElement(name = "hslClr", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
CTHslColor.class),
- @XmlElement(name = "srgbClr", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
CTSRgbColor.class),
- @XmlElement(name = "scrgbClr", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
CTScRgbColor.class),
- @XmlElement(name = "schemeClr", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
CTSchemeColor.class)
+ @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;
@@ -79,18 +79,18 @@ public class CTColorMRU {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link CTPresetColor }
- * {@link CTSystemColor }
- * {@link CTHslColor }
- * {@link CTSRgbColor }
* {@link CTScRgbColor }
+ * {@link CTSRgbColor }
+ * {@link CTHslColor }
+ * {@link CTSystemColor }
* {@link CTSchemeColor }
+ * {@link CTPresetColor }
*
*
*/
public List<Object> getEGColorChoice() {
if (egColorChoice == null) {
- egColorChoice = new ArrayList<>();
+ egColorChoice = new ArrayList<Object>();
}
return this.egColorChoice;
}
Modified:
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTComplementTransform.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTComplementTransform.java?rev=1823910&r1=1823909&r2=1823910&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTComplementTransform.java
(original)
+++
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTComplementTransform.java
Sun Feb 11 22:09:58 2018
@@ -28,18 +28,18 @@ import javax.xml.bind.annotation.XmlType
* <p>The following schema fragment specifies the expected content contained
within this class.
*
* <pre>
- * <complexType name="CT_ComplementTransform">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- * </restriction>
- * </complexContent>
- * </complexType>
+ * <complexType name="CT_ComplementTransform">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_ComplementTransform", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
+@XmlType(name = "CT_ComplementTransform")
public class CTComplementTransform {
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTConnection.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTConnection.java?rev=1823910&r1=1823909&r2=1823910&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTConnection.java
(original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTConnection.java Sun Feb
11 22:09:58 2018
@@ -30,25 +30,25 @@ import javax.xml.bind.annotation.XmlType
* <p>The following schema fragment specifies the expected content contained
within this class.
*
* <pre>
- * <complexType name="CT_Connection">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- * <attribute name="id" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_DrawingElementId";
/>
- * <attribute name="idx" use="required"
type="{http://www.w3.org/2001/XMLSchema}unsignedInt"; />
- * </restriction>
- * </complexContent>
- * </complexType>
+ * <complexType name="CT_Connection">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <attribute name="id" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_DrawingElementId";
/>
+ * <attribute name="idx" use="required"
type="{http://www.w3.org/2001/XMLSchema}unsignedInt"; />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Connection", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
+@XmlType(name = "CT_Connection")
public class CTConnection {
- @XmlAttribute(required = true)
+ @XmlAttribute(name = "id", required = true)
protected long id;
- @XmlAttribute(required = true)
+ @XmlAttribute(name = "idx", required = true)
@XmlSchemaType(name = "unsignedInt")
protected long idx;
Modified:
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTConnectionSite.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTConnectionSite.java?rev=1823910&r1=1823909&r2=1823910&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTConnectionSite.java
(original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTConnectionSite.java Sun
Feb 11 22:09:58 2018
@@ -30,29 +30,29 @@ import javax.xml.bind.annotation.XmlType
* <p>The following schema fragment specifies the expected content contained
within this class.
*
* <pre>
- * <complexType name="CT_ConnectionSite">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- * <sequence>
- * <element name="pos"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_AdjPoint2D"/>
- * </sequence>
- * <attribute name="ang" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjAngle"; />
- * </restriction>
- * </complexContent>
- * </complexType>
+ * <complexType name="CT_ConnectionSite">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="pos"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_AdjPoint2D"/>
+ * </sequence>
+ * <attribute name="ang" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjAngle"; />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_ConnectionSite", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = {
+@XmlType(name = "CT_ConnectionSite", propOrder = {
"pos"
})
public class CTConnectionSite {
- @XmlElement(namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, required = true)
+ @XmlElement(required = true)
protected CTAdjPoint2D pos;
- @XmlAttribute(required = true)
+ @XmlAttribute(name = "ang", required = true)
protected String ang;
/**
Modified:
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTConnectionSiteList.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTConnectionSiteList.java?rev=1823910&r1=1823909&r2=1823910&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTConnectionSiteList.java
(original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTConnectionSiteList.java
Sun Feb 11 22:09:58 2018
@@ -21,7 +21,6 @@ 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;
@@ -31,26 +30,25 @@ import javax.xml.bind.annotation.XmlType
* <p>The following schema fragment specifies the expected content contained
within this class.
*
* <pre>
- * <complexType name="CT_ConnectionSiteList">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- * <sequence>
- * <element name="cxn"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_ConnectionSite";
maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
+ * <complexType name="CT_ConnectionSiteList">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="cxn"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_ConnectionSite";
maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_ConnectionSiteList", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = {
+@XmlType(name = "CT_ConnectionSiteList", propOrder = {
"cxn"
})
public class CTConnectionSiteList {
- @XmlElement(namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
protected List<CTConnectionSite> cxn;
/**
@@ -77,7 +75,7 @@ public class CTConnectionSiteList {
*/
public List<CTConnectionSite> getCxn() {
if (cxn == null) {
- cxn = new ArrayList<>();
+ cxn = new ArrayList<CTConnectionSite>();
}
return this.cxn;
}
Modified:
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTCustomGeometry2D.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTCustomGeometry2D.java?rev=1823910&r1=1823909&r2=1823910&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTCustomGeometry2D.java
(original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTCustomGeometry2D.java
Sun Feb 11 22:09:58 2018
@@ -29,26 +29,26 @@ import javax.xml.bind.annotation.XmlType
* <p>The following schema fragment specifies the expected content contained
within this class.
*
* <pre>
- * <complexType name="CT_CustomGeometry2D">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- * <sequence>
- * <element name="avLst"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_GeomGuideList";
minOccurs="0"/>
- * <element name="gdLst"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_GeomGuideList";
minOccurs="0"/>
- * <element name="ahLst"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_AdjustHandleList";
minOccurs="0"/>
- * <element name="cxnLst"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_ConnectionSiteList";
minOccurs="0"/>
- * <element name="rect"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_GeomRect";
minOccurs="0"/>
- * <element name="pathLst"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DList"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
+ * <complexType name="CT_CustomGeometry2D">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="avLst"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_GeomGuideList";
minOccurs="0"/>
+ * <element name="gdLst"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_GeomGuideList";
minOccurs="0"/>
+ * <element name="ahLst"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_AdjustHandleList";
minOccurs="0"/>
+ * <element name="cxnLst"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_ConnectionSiteList";
minOccurs="0"/>
+ * <element name="rect"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_GeomRect";
minOccurs="0"/>
+ * <element name="pathLst"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DList"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_CustomGeometry2D", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = {
+@XmlType(name = "CT_CustomGeometry2D", propOrder = {
"avLst",
"gdLst",
"ahLst",
@@ -58,17 +58,12 @@ import javax.xml.bind.annotation.XmlType
})
public class CTCustomGeometry2D {
- @XmlElement(namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
protected CTGeomGuideList avLst;
- @XmlElement(namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
protected CTGeomGuideList gdLst;
- @XmlElement(namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
protected CTAdjustHandleList ahLst;
- @XmlElement(namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
protected CTConnectionSiteList cxnLst;
- @XmlElement(namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
protected CTGeomRect rect;
- @XmlElement(namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, required = true)
+ @XmlElement(required = true)
protected CTPath2DList pathLst;
/**
Modified:
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTEmbeddedWAVAudioFile.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTEmbeddedWAVAudioFile.java?rev=1823910&r1=1823909&r2=1823910&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTEmbeddedWAVAudioFile.java
(original)
+++
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTEmbeddedWAVAudioFile.java
Sun Feb 11 22:09:58 2018
@@ -29,28 +29,28 @@ import javax.xml.bind.annotation.XmlType
* <p>The following schema fragment specifies the expected content contained
within this class.
*
* <pre>
- * <complexType name="CT_EmbeddedWAVAudioFile">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- * <attribute
ref="{http://schemas.openxmlformats.org/officeDocument/2006/relationships}embed
use="required""/>
- * <attribute name="name"
type="{http://www.w3.org/2001/XMLSchema}string"; default="" />
- * <attribute name="builtIn"
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
- * </restriction>
- * </complexContent>
- * </complexType>
+ * <complexType name="CT_EmbeddedWAVAudioFile">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <attribute
ref="{http://schemas.openxmlformats.org/officeDocument/2006/relationships}embed
use="required""/>
+ * <attribute name="name"
type="{http://www.w3.org/2001/XMLSchema}string"; default="" />
+ * <attribute name="builtIn"
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_EmbeddedWAVAudioFile", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
+@XmlType(name = "CT_EmbeddedWAVAudioFile")
public class CTEmbeddedWAVAudioFile {
- @XmlAttribute(namespace =
"http://schemas.openxmlformats.org/officeDocument/2006/relationships";, required
= true)
+ @XmlAttribute(name = "embed", namespace =
"http://schemas.openxmlformats.org/officeDocument/2006/relationships";, required
= true)
protected String embed;
- @XmlAttribute
+ @XmlAttribute(name = "name")
protected String name;
- @XmlAttribute
+ @XmlAttribute(name = "builtIn")
protected Boolean builtIn;
/**
Modified:
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTFixedPercentage.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTFixedPercentage.java?rev=1823910&r1=1823909&r2=1823910&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTFixedPercentage.java
(original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTFixedPercentage.java
Sun Feb 11 22:09:58 2018
@@ -29,22 +29,22 @@ import javax.xml.bind.annotation.XmlType
* <p>The following schema fragment specifies the expected content contained
within this class.
*
* <pre>
- * <complexType name="CT_FixedPercentage">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- * <attribute name="val" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_FixedPercentage";
/>
- * </restriction>
- * </complexContent>
- * </complexType>
+ * <complexType name="CT_FixedPercentage">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <attribute name="val" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_FixedPercentage";
/>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_FixedPercentage", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
+@XmlType(name = "CT_FixedPercentage")
public class CTFixedPercentage {
- @XmlAttribute(required = true)
+ @XmlAttribute(name = "val", required = true)
protected int val;
/**
Modified:
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGammaTransform.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGammaTransform.java?rev=1823910&r1=1823909&r2=1823910&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGammaTransform.java
(original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGammaTransform.java Sun
Feb 11 22:09:58 2018
@@ -28,18 +28,18 @@ import javax.xml.bind.annotation.XmlType
* <p>The following schema fragment specifies the expected content contained
within this class.
*
* <pre>
- * <complexType name="CT_GammaTransform">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- * </restriction>
- * </complexContent>
- * </complexType>
+ * <complexType name="CT_GammaTransform">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_GammaTransform", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
+@XmlType(name = "CT_GammaTransform")
public class CTGammaTransform {
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGeomGuide.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGeomGuide.java?rev=1823910&r1=1823909&r2=1823910&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGeomGuide.java
(original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGeomGuide.java Sun Feb
11 22:09:58 2018
@@ -31,26 +31,26 @@ import javax.xml.bind.annotation.adapter
* <p>The following schema fragment specifies the expected content contained
within this class.
*
* <pre>
- * <complexType name="CT_GeomGuide">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- * <attribute name="name" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_GeomGuideName";
/>
- * <attribute name="fmla" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_GeomGuideFormula";
/>
- * </restriction>
- * </complexContent>
- * </complexType>
+ * <complexType name="CT_GeomGuide">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <attribute name="name" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_GeomGuideName";
/>
+ * <attribute name="fmla" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_GeomGuideFormula";
/>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_GeomGuide", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
+@XmlType(name = "CT_GeomGuide")
public class CTGeomGuide {
- @XmlAttribute(required = true)
+ @XmlAttribute(name = "name", required = true)
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
protected String name;
- @XmlAttribute(required = true)
+ @XmlAttribute(name = "fmla", required = true)
protected String fmla;
/**
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGeomGuideList.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGeomGuideList.java?rev=1823910&r1=1823909&r2=1823910&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGeomGuideList.java
(original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGeomGuideList.java Sun
Feb 11 22:09:58 2018
@@ -21,7 +21,6 @@ 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;
@@ -31,26 +30,25 @@ import javax.xml.bind.annotation.XmlType
* <p>The following schema fragment specifies the expected content contained
within this class.
*
* <pre>
- * <complexType name="CT_GeomGuideList">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- * <sequence>
- * <element name="gd"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_GeomGuide";
maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
+ * <complexType name="CT_GeomGuideList">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="gd"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_GeomGuide";
maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_GeomGuideList", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = {
+@XmlType(name = "CT_GeomGuideList", propOrder = {
"gd"
})
public class CTGeomGuideList {
- @XmlElement(namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
protected List<CTGeomGuide> gd;
/**
@@ -77,7 +75,7 @@ public class CTGeomGuideList {
*/
public List<CTGeomGuide> getGd() {
if (gd == null) {
- gd = new ArrayList<>();
+ gd = new ArrayList<CTGeomGuide>();
}
return this.gd;
}
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGeomRect.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGeomRect.java?rev=1823910&r1=1823909&r2=1823910&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGeomRect.java (original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGeomRect.java Sun Feb
11 22:09:58 2018
@@ -29,31 +29,31 @@ import javax.xml.bind.annotation.XmlType
* <p>The following schema fragment specifies the expected content contained
within this class.
*
* <pre>
- * <complexType name="CT_GeomRect">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- * <attribute name="l" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate";
/>
- * <attribute name="t" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate";
/>
- * <attribute name="r" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate";
/>
- * <attribute name="b" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate";
/>
- * </restriction>
- * </complexContent>
- * </complexType>
+ * <complexType name="CT_GeomRect">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <attribute name="l" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate";
/>
+ * <attribute name="t" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate";
/>
+ * <attribute name="r" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate";
/>
+ * <attribute name="b" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate";
/>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_GeomRect", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
+@XmlType(name = "CT_GeomRect")
public class CTGeomRect {
- @XmlAttribute(required = true)
+ @XmlAttribute(name = "l", required = true)
protected String l;
- @XmlAttribute(required = true)
+ @XmlAttribute(name = "t", required = true)
protected String t;
- @XmlAttribute(required = true)
+ @XmlAttribute(name = "r", required = true)
protected String r;
- @XmlAttribute(required = true)
+ @XmlAttribute(name = "b", required = true)
protected String b;
/**
Modified:
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGrayscaleTransform.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGrayscaleTransform.java?rev=1823910&r1=1823909&r2=1823910&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGrayscaleTransform.java
(original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGrayscaleTransform.java
Sun Feb 11 22:09:58 2018
@@ -28,18 +28,18 @@ import javax.xml.bind.annotation.XmlType
* <p>The following schema fragment specifies the expected content contained
within this class.
*
* <pre>
- * <complexType name="CT_GrayscaleTransform">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- * </restriction>
- * </complexContent>
- * </complexType>
+ * <complexType name="CT_GrayscaleTransform">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_GrayscaleTransform", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
+@XmlType(name = "CT_GrayscaleTransform")
public class CTGrayscaleTransform {
Modified:
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGroupTransform2D.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGroupTransform2D.java?rev=1823910&r1=1823909&r2=1823910&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGroupTransform2D.java
(original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTGroupTransform2D.java
Sun Feb 11 22:09:58 2018
@@ -20,7 +20,6 @@ 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;
@@ -30,27 +29,27 @@ import javax.xml.bind.annotation.XmlType
* <p>The following schema fragment specifies the expected content contained
within this class.
*
* <pre>
- * <complexType name="CT_GroupTransform2D">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- * <sequence>
- * <element name="off"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Point2D";
minOccurs="0"/>
- * <element name="ext"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_PositiveSize2D";
minOccurs="0"/>
- * <element name="chOff"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Point2D";
minOccurs="0"/>
- * <element name="chExt"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_PositiveSize2D";
minOccurs="0"/>
- * </sequence>
- * <attribute name="rot"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Angle";
default="0" />
- * <attribute name="flipH"
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
- * <attribute name="flipV"
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
- * </restriction>
- * </complexContent>
- * </complexType>
+ * <complexType name="CT_GroupTransform2D">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="off"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Point2D";
minOccurs="0"/>
+ * <element name="ext"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_PositiveSize2D";
minOccurs="0"/>
+ * <element name="chOff"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Point2D";
minOccurs="0"/>
+ * <element name="chExt"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_PositiveSize2D";
minOccurs="0"/>
+ * </sequence>
+ * <attribute name="rot"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Angle";
default="0" />
+ * <attribute name="flipH"
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
+ * <attribute name="flipV"
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_GroupTransform2D", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = {
+@XmlType(name = "CT_GroupTransform2D", propOrder = {
"off",
"ext",
"chOff",
@@ -58,19 +57,15 @@ import javax.xml.bind.annotation.XmlType
})
public class CTGroupTransform2D {
- @XmlElement(namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
protected CTPoint2D off;
- @XmlElement(namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
protected CTPositiveSize2D ext;
- @XmlElement(namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
protected CTPoint2D chOff;
- @XmlElement(namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
protected CTPositiveSize2D chExt;
- @XmlAttribute
+ @XmlAttribute(name = "rot")
protected Integer rot;
- @XmlAttribute
+ @XmlAttribute(name = "flipH")
protected Boolean flipH;
- @XmlAttribute
+ @XmlAttribute(name = "flipV")
protected Boolean flipV;
/**
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTHslColor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTHslColor.java?rev=1823910&r1=1823909&r2=1823910&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTHslColor.java (original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTHslColor.java Sun Feb
11 22:09:58 2018
@@ -34,64 +34,64 @@ import javax.xml.bind.annotation.XmlType
* <p>The following schema fragment specifies the expected content contained
within this class.
*
* <pre>
- * <complexType name="CT_HslColor">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- * <sequence>
- * <group
ref="{http://schemas.openxmlformats.org/drawingml/2006/main}EG_ColorTransform";
maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * <attribute name="hue" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveFixedAngle";
/>
- * <attribute name="sat" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage"; />
- * <attribute name="lum" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage"; />
- * </restriction>
- * </complexContent>
- * </complexType>
+ * <complexType name="CT_HslColor">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <group
ref="{http://schemas.openxmlformats.org/drawingml/2006/main}EG_ColorTransform";
maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * <attribute name="hue" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveFixedAngle";
/>
+ * <attribute name="sat" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage";
/>
+ * <attribute name="lum" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage";
/>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_HslColor", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = {
+@XmlType(name = "CT_HslColor", propOrder = {
"egColorTransform"
})
public class CTHslColor {
@XmlElementRefs({
- @XmlElementRef(name = "comp", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
JAXBElement.class),
- @XmlElementRef(name = "satMod", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
JAXBElement.class),
- @XmlElementRef(name = "tint", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
JAXBElement.class),
- @XmlElementRef(name = "satOff", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
JAXBElement.class),
- @XmlElementRef(name = "lum", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
JAXBElement.class),
- @XmlElementRef(name = "gray", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
JAXBElement.class),
- @XmlElementRef(name = "gamma", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
JAXBElement.class),
- @XmlElementRef(name = "inv", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
JAXBElement.class),
- @XmlElementRef(name = "red", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
JAXBElement.class),
- @XmlElementRef(name = "alpha", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
JAXBElement.class),
- @XmlElementRef(name = "greenOff", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
JAXBElement.class),
- @XmlElementRef(name = "green", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
JAXBElement.class),
- @XmlElementRef(name = "greenMod", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
JAXBElement.class),
- @XmlElementRef(name = "blueOff", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
JAXBElement.class),
- @XmlElementRef(name = "lumMod", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
JAXBElement.class),
- @XmlElementRef(name = "redOff", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
JAXBElement.class),
- @XmlElementRef(name = "hueOff", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
JAXBElement.class),
- @XmlElementRef(name = "invGamma", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
JAXBElement.class),
- @XmlElementRef(name = "alphaOff", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
JAXBElement.class),
- @XmlElementRef(name = "hue", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
JAXBElement.class),
- @XmlElementRef(name = "redMod", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
JAXBElement.class),
- @XmlElementRef(name = "alphaMod", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
JAXBElement.class),
- @XmlElementRef(name = "lumOff", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
JAXBElement.class),
- @XmlElementRef(name = "blue", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
JAXBElement.class),
- @XmlElementRef(name = "hueMod", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
JAXBElement.class),
- @XmlElementRef(name = "blueMod", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
JAXBElement.class),
- @XmlElementRef(name = "sat", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
JAXBElement.class),
- @XmlElementRef(name = "shade", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
JAXBElement.class)
+ @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(required = true)
+ @XmlAttribute(name = "hue", required = true)
protected int hue;
- @XmlAttribute(required = true)
+ @XmlAttribute(name = "sat", required = true)
protected int sat;
- @XmlAttribute(required = true)
+ @XmlAttribute(name = "lum", required = true)
protected int lum;
/**
@@ -112,40 +112,40 @@ public class CTHslColor {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
* {@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 CTGammaTransform }{@code >}
+ * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >}
* {@link JAXBElement }{@code <}{@link CTInverseTransform }{@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 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 CTAngle }{@code >}
- * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >}
- * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@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 CTPositivePercentage }{@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 CTPositivePercentage }{@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 >}
- * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >}
*
*
*/
public List<JAXBElement<?>> getEGColorTransform() {
if (egColorTransform == null) {
- egColorTransform = new ArrayList<>();
+ egColorTransform = new ArrayList<JAXBElement<?>>();
}
return this.egColorTransform;
}
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTHyperlink.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTHyperlink.java?rev=1823910&r1=1823909&r2=1823910&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTHyperlink.java
(original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTHyperlink.java Sun Feb
11 22:09:58 2018
@@ -20,7 +20,6 @@ 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;
@@ -30,54 +29,52 @@ import javax.xml.bind.annotation.XmlType
* <p>The following schema fragment specifies the expected content contained
within this class.
*
* <pre>
- * <complexType name="CT_Hyperlink">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- * <sequence>
- * <element name="snd"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_EmbeddedWAVAudioFile";
minOccurs="0"/>
- * <element name="extLst"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_OfficeArtExtensionList";
minOccurs="0"/>
- * </sequence>
- * <attribute
ref="{http://schemas.openxmlformats.org/officeDocument/2006/relationships}id"/>
- * <attribute name="invalidUrl"
type="{http://www.w3.org/2001/XMLSchema}string"; default="" />
- * <attribute name="action"
type="{http://www.w3.org/2001/XMLSchema}string"; default="" />
- * <attribute name="tgtFrame"
type="{http://www.w3.org/2001/XMLSchema}string"; default="" />
- * <attribute name="tooltip"
type="{http://www.w3.org/2001/XMLSchema}string"; default="" />
- * <attribute name="history"
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="true" />
- * <attribute name="highlightClick"
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
- * <attribute name="endSnd"
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
- * </restriction>
- * </complexContent>
- * </complexType>
+ * <complexType name="CT_Hyperlink">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="snd"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_EmbeddedWAVAudioFile";
minOccurs="0"/>
+ * <element name="extLst"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_OfficeArtExtensionList";
minOccurs="0"/>
+ * </sequence>
+ * <attribute
ref="{http://schemas.openxmlformats.org/officeDocument/2006/relationships}id"/>
+ * <attribute name="invalidUrl"
type="{http://www.w3.org/2001/XMLSchema}string"; default="" />
+ * <attribute name="action"
type="{http://www.w3.org/2001/XMLSchema}string"; default="" />
+ * <attribute name="tgtFrame"
type="{http://www.w3.org/2001/XMLSchema}string"; default="" />
+ * <attribute name="tooltip"
type="{http://www.w3.org/2001/XMLSchema}string"; default="" />
+ * <attribute name="history"
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="true" />
+ * <attribute name="highlightClick"
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
+ * <attribute name="endSnd"
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="false" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Hyperlink", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = {
+@XmlType(name = "CT_Hyperlink", propOrder = {
"snd",
"extLst"
})
public class CTHyperlink {
- @XmlElement(namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
protected CTEmbeddedWAVAudioFile snd;
- @XmlElement(namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
protected CTOfficeArtExtensionList extLst;
- @XmlAttribute(namespace =
"http://schemas.openxmlformats.org/officeDocument/2006/relationships";)
+ @XmlAttribute(name = "id", namespace =
"http://schemas.openxmlformats.org/officeDocument/2006/relationships";)
protected String id;
- @XmlAttribute
+ @XmlAttribute(name = "invalidUrl")
protected String invalidUrl;
- @XmlAttribute
+ @XmlAttribute(name = "action")
protected String action;
- @XmlAttribute
+ @XmlAttribute(name = "tgtFrame")
protected String tgtFrame;
- @XmlAttribute
+ @XmlAttribute(name = "tooltip")
protected String tooltip;
- @XmlAttribute
+ @XmlAttribute(name = "history")
protected Boolean history;
- @XmlAttribute
+ @XmlAttribute(name = "highlightClick")
protected Boolean highlightClick;
- @XmlAttribute
+ @XmlAttribute(name = "endSnd")
protected Boolean endSnd;
/**
Modified:
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTInverseGammaTransform.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTInverseGammaTransform.java?rev=1823910&r1=1823909&r2=1823910&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTInverseGammaTransform.java
(original)
+++
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTInverseGammaTransform.java
Sun Feb 11 22:09:58 2018
@@ -28,18 +28,18 @@ import javax.xml.bind.annotation.XmlType
* <p>The following schema fragment specifies the expected content contained
within this class.
*
* <pre>
- * <complexType name="CT_InverseGammaTransform">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- * </restriction>
- * </complexContent>
- * </complexType>
+ * <complexType name="CT_InverseGammaTransform">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_InverseGammaTransform", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
+@XmlType(name = "CT_InverseGammaTransform")
public class CTInverseGammaTransform {
Modified:
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTInverseTransform.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTInverseTransform.java?rev=1823910&r1=1823909&r2=1823910&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTInverseTransform.java
(original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTInverseTransform.java
Sun Feb 11 22:09:58 2018
@@ -28,18 +28,18 @@ import javax.xml.bind.annotation.XmlType
* <p>The following schema fragment specifies the expected content contained
within this class.
*
* <pre>
- * <complexType name="CT_InverseTransform">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- * </restriction>
- * </complexContent>
- * </complexType>
+ * <complexType name="CT_InverseTransform">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_InverseTransform", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
+@XmlType(name = "CT_InverseTransform")
public class CTInverseTransform {
Modified:
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTOfficeArtExtension.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTOfficeArtExtension.java?rev=1823910&r1=1823909&r2=1823910&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTOfficeArtExtension.java
(original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTOfficeArtExtension.java
Sun Feb 11 22:09:58 2018
@@ -34,29 +34,29 @@ import org.w3c.dom.Element;
* <p>The following schema fragment specifies the expected content contained
within this class.
*
* <pre>
- * <complexType name="CT_OfficeArtExtension">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- * <sequence>
- * <any processContents='lax'/>
- * </sequence>
- * <attribute name="uri"
type="{http://www.w3.org/2001/XMLSchema}token"; />
- * </restriction>
- * </complexContent>
- * </complexType>
+ * <complexType name="CT_OfficeArtExtension">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <any processContents='lax'/>
+ * </sequence>
+ * <attribute name="uri"
type="{http://www.w3.org/2001/XMLSchema}token"; />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_OfficeArtExtension", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = {
+@XmlType(name = "CT_OfficeArtExtension", propOrder = {
"any"
})
public class CTOfficeArtExtension {
@XmlAnyElement(lax = true)
protected Object any;
- @XmlAttribute
+ @XmlAttribute(name = "uri")
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
@XmlSchemaType(name = "token")
protected String uri;
Modified:
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTOfficeArtExtensionList.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTOfficeArtExtensionList.java?rev=1823910&r1=1823909&r2=1823910&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTOfficeArtExtensionList.java
(original)
+++
poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTOfficeArtExtensionList.java
Sun Feb 11 22:09:58 2018
@@ -21,7 +21,6 @@ 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;
@@ -31,26 +30,25 @@ import javax.xml.bind.annotation.XmlType
* <p>The following schema fragment specifies the expected content contained
within this class.
*
* <pre>
- * <complexType name="CT_OfficeArtExtensionList">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- * <sequence>
- * <group
ref="{http://schemas.openxmlformats.org/drawingml/2006/main}EG_OfficeArtExtensionList"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
+ * <complexType name="CT_OfficeArtExtensionList">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <group
ref="{http://schemas.openxmlformats.org/drawingml/2006/main}EG_OfficeArtExtensionList"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_OfficeArtExtensionList", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = {
+@XmlType(name = "CT_OfficeArtExtensionList", propOrder = {
"ext"
})
public class CTOfficeArtExtensionList {
- @XmlElement(namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
protected List<CTOfficeArtExtension> ext;
/**
@@ -77,7 +75,7 @@ public class CTOfficeArtExtensionList {
*/
public List<CTOfficeArtExtension> getExt() {
if (ext == null) {
- ext = new ArrayList<>();
+ ext = new ArrayList<CTOfficeArtExtension>();
}
return this.ext;
}
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2D.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2D.java?rev=1823910&r1=1823909&r2=1823910&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2D.java (original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2D.java Sun Feb 11
22:09:58 2018
@@ -33,53 +33,53 @@ import javax.xml.bind.annotation.XmlType
* <p>The following schema fragment specifies the expected content contained
within this class.
*
* <pre>
- * <complexType name="CT_Path2D">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- * <choice maxOccurs="unbounded" minOccurs="0">
- * <element name="close"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DClose"/>
- * <element name="moveTo"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DMoveTo"/>
- * <element name="lnTo"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DLineTo"/>
- * <element name="arcTo"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DArcTo"/>
- * <element name="quadBezTo"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DQuadBezierTo"/>
- * <element name="cubicBezTo"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DCubicBezierTo"/>
- * </choice>
- * <attribute name="w"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveCoordinate";
default="0" />
- * <attribute name="h"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveCoordinate";
default="0" />
- * <attribute name="fill"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PathFillMode";
default="norm" />
- * <attribute name="stroke"
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="true" />
- * <attribute name="extrusionOk"
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="true" />
- * </restriction>
- * </complexContent>
- * </complexType>
+ * <complexType name="CT_Path2D">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <choice maxOccurs="unbounded" minOccurs="0">
+ * <element name="close"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DClose"/>
+ * <element name="moveTo"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DMoveTo"/>
+ * <element name="lnTo"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DLineTo"/>
+ * <element name="arcTo"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DArcTo"/>
+ * <element name="quadBezTo"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DQuadBezierTo"/>
+ * <element name="cubicBezTo"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2DCubicBezierTo"/>
+ * </choice>
+ * <attribute name="w"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveCoordinate";
default="0" />
+ * <attribute name="h"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveCoordinate";
default="0" />
+ * <attribute name="fill"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PathFillMode";
default="norm" />
+ * <attribute name="stroke"
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="true" />
+ * <attribute name="extrusionOk"
type="{http://www.w3.org/2001/XMLSchema}boolean"; default="true" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Path2D", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = {
+@XmlType(name = "CT_Path2D", propOrder = {
"closeOrMoveToOrLnTo"
})
public class CTPath2D {
@XmlElements({
- @XmlElement(name = "lnTo", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
CTPath2DLineTo.class),
- @XmlElement(name = "close", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
CTPath2DClose.class),
- @XmlElement(name = "cubicBezTo", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
CTPath2DCubicBezierTo.class),
- @XmlElement(name = "quadBezTo", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
CTPath2DQuadBezierTo.class),
- @XmlElement(name = "arcTo", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
CTPath2DArcTo.class),
- @XmlElement(name = "moveTo", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";, type =
CTPath2DMoveTo.class)
+ @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
+ @XmlAttribute(name = "w")
protected Long w;
- @XmlAttribute
+ @XmlAttribute(name = "h")
protected Long h;
- @XmlAttribute
+ @XmlAttribute(name = "fill")
protected STPathFillMode fill;
- @XmlAttribute
+ @XmlAttribute(name = "stroke")
protected Boolean stroke;
- @XmlAttribute
+ @XmlAttribute(name = "extrusionOk")
protected Boolean extrusionOk;
/**
@@ -100,18 +100,18 @@ public class CTPath2D {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link CTPath2DLineTo }
* {@link CTPath2DClose }
- * {@link CTPath2DCubicBezierTo }
- * {@link CTPath2DQuadBezierTo }
- * {@link CTPath2DArcTo }
* {@link CTPath2DMoveTo }
+ * {@link CTPath2DLineTo }
+ * {@link CTPath2DArcTo }
+ * {@link CTPath2DQuadBezierTo }
+ * {@link CTPath2DCubicBezierTo }
*
*
*/
public List<Object> getCloseOrMoveToOrLnTo() {
if (closeOrMoveToOrLnTo == null) {
- closeOrMoveToOrLnTo = new ArrayList<>();
+ closeOrMoveToOrLnTo = new ArrayList<Object>();
}
return this.closeOrMoveToOrLnTo;
}
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DArcTo.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DArcTo.java?rev=1823910&r1=1823909&r2=1823910&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DArcTo.java
(original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DArcTo.java Sun
Feb 11 22:09:58 2018
@@ -29,31 +29,31 @@ import javax.xml.bind.annotation.XmlType
* <p>The following schema fragment specifies the expected content contained
within this class.
*
* <pre>
- * <complexType name="CT_Path2DArcTo">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- * <attribute name="wR" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate";
/>
- * <attribute name="hR" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate";
/>
- * <attribute name="stAng" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjAngle"; />
- * <attribute name="swAng" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjAngle"; />
- * </restriction>
- * </complexContent>
- * </complexType>
+ * <complexType name="CT_Path2DArcTo">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <attribute name="wR" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate";
/>
+ * <attribute name="hR" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate";
/>
+ * <attribute name="stAng" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjAngle"; />
+ * <attribute name="swAng" use="required"
type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjAngle"; />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Path2DArcTo", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
+@XmlType(name = "CT_Path2DArcTo")
public class CTPath2DArcTo {
@XmlAttribute(name = "wR", required = true)
protected String wr;
@XmlAttribute(name = "hR", required = true)
protected String hr;
- @XmlAttribute(required = true)
+ @XmlAttribute(name = "stAng", required = true)
protected String stAng;
- @XmlAttribute(required = true)
+ @XmlAttribute(name = "swAng", required = true)
protected String swAng;
/**
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DClose.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DClose.java?rev=1823910&r1=1823909&r2=1823910&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DClose.java
(original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DClose.java Sun
Feb 11 22:09:58 2018
@@ -28,18 +28,18 @@ import javax.xml.bind.annotation.XmlType
* <p>The following schema fragment specifies the expected content contained
within this class.
*
* <pre>
- * <complexType name="CT_Path2DClose">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
- * </restriction>
- * </complexContent>
- * </complexType>
+ * <complexType name="CT_Path2DClose">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CT_Path2DClose", namespace =
"http://schemas.openxmlformats.org/drawingml/2006/main";)
+@XmlType(name = "CT_Path2DClose")
public class CTPath2DClose {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
