Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DCubicBezierTo.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DCubicBezierTo.java?rev=1823910&r1=1823909&r2=1823910&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DCubicBezierTo.java (original) +++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DCubicBezierTo.java Sun Feb 11 22:09:58 2018 @@ -31,26 +31,26 @@ import javax.xml.bind.annotation.XmlType * <p>The following schema fragment specifies the expected content contained within this class. * * <pre> - * <complexType name="CT_Path2DCubicBezierTo"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> - * <sequence> - * <element name="pt" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_AdjPoint2D"; maxOccurs="3" minOccurs="3"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> + * <complexType name="CT_Path2DCubicBezierTo"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="pt" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_AdjPoint2D"; maxOccurs="3" minOccurs="3"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> * </pre> * * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CT_Path2DCubicBezierTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { +@XmlType(name = "CT_Path2DCubicBezierTo", propOrder = { "pt" }) public class CTPath2DCubicBezierTo { - @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, required = true) + @XmlElement(required = true) protected List<CTAdjPoint2D> pt; /** @@ -77,7 +77,7 @@ public class CTPath2DCubicBezierTo { */ public List<CTAdjPoint2D> getPt() { if (pt == null) { - pt = new ArrayList<>(); + pt = new ArrayList<CTAdjPoint2D>(); } return this.pt; }
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DLineTo.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DLineTo.java?rev=1823910&r1=1823909&r2=1823910&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DLineTo.java (original) +++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DLineTo.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_Path2DLineTo"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> - * <sequence> - * <element name="pt" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_AdjPoint2D"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> + * <complexType name="CT_Path2DLineTo"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="pt" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_AdjPoint2D"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> * </pre> * * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CT_Path2DLineTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { +@XmlType(name = "CT_Path2DLineTo", propOrder = { "pt" }) public class CTPath2DLineTo { - @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, required = true) + @XmlElement(required = true) protected CTAdjPoint2D pt; /** Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DList.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DList.java?rev=1823910&r1=1823909&r2=1823910&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DList.java (original) +++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DList.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_Path2DList"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> - * <sequence> - * <element name="path" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2D"; maxOccurs="unbounded" minOccurs="0"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> + * <complexType name="CT_Path2DList"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="path" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Path2D"; maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> * </pre> * * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CT_Path2DList", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { +@XmlType(name = "CT_Path2DList", propOrder = { "path" }) public class CTPath2DList { - @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) protected List<CTPath2D> path; /** @@ -77,7 +75,7 @@ public class CTPath2DList { */ public List<CTPath2D> getPath() { if (path == null) { - path = new ArrayList<>(); + path = new ArrayList<CTPath2D>(); } return this.path; } Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DMoveTo.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DMoveTo.java?rev=1823910&r1=1823909&r2=1823910&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DMoveTo.java (original) +++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DMoveTo.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_Path2DMoveTo"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> - * <sequence> - * <element name="pt" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_AdjPoint2D"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> + * <complexType name="CT_Path2DMoveTo"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="pt" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_AdjPoint2D"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> * </pre> * * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CT_Path2DMoveTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { +@XmlType(name = "CT_Path2DMoveTo", propOrder = { "pt" }) public class CTPath2DMoveTo { - @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, required = true) + @XmlElement(required = true) protected CTAdjPoint2D pt; /** Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DQuadBezierTo.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DQuadBezierTo.java?rev=1823910&r1=1823909&r2=1823910&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DQuadBezierTo.java (original) +++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPath2DQuadBezierTo.java Sun Feb 11 22:09:58 2018 @@ -31,26 +31,26 @@ import javax.xml.bind.annotation.XmlType * <p>The following schema fragment specifies the expected content contained within this class. * * <pre> - * <complexType name="CT_Path2DQuadBezierTo"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> - * <sequence> - * <element name="pt" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_AdjPoint2D"; maxOccurs="2" minOccurs="2"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> + * <complexType name="CT_Path2DQuadBezierTo"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="pt" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_AdjPoint2D"; maxOccurs="2" minOccurs="2"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> * </pre> * * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CT_Path2DQuadBezierTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { +@XmlType(name = "CT_Path2DQuadBezierTo", propOrder = { "pt" }) public class CTPath2DQuadBezierTo { - @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, required = true) + @XmlElement(required = true) protected List<CTAdjPoint2D> pt; /** @@ -77,7 +77,7 @@ public class CTPath2DQuadBezierTo { */ public List<CTAdjPoint2D> getPt() { if (pt == null) { - pt = new ArrayList<>(); + pt = new ArrayList<CTAdjPoint2D>(); } return this.pt; } Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPercentage.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPercentage.java?rev=1823910&r1=1823909&r2=1823910&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPercentage.java (original) +++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPercentage.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_Percentage"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> - * <attribute name="val" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage"; /> - * </restriction> - * </complexContent> - * </complexType> + * <complexType name="CT_Percentage"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <attribute name="val" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage"; /> + * </restriction> + * </complexContent> + * </complexType> * </pre> * * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CT_Percentage", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) +@XmlType(name = "CT_Percentage") public class CTPercentage { - @XmlAttribute(required = true) + @XmlAttribute(name = "val", required = true) protected int val; /** Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPoint2D.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPoint2D.java?rev=1823910&r1=1823909&r2=1823910&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPoint2D.java (original) +++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPoint2D.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_Point2D"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> - * <attribute name="x" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate"; /> - * <attribute name="y" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate"; /> - * </restriction> - * </complexContent> - * </complexType> + * <complexType name="CT_Point2D"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <attribute name="x" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate"; /> + * <attribute name="y" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate"; /> + * </restriction> + * </complexContent> + * </complexType> * </pre> * * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CT_Point2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) +@XmlType(name = "CT_Point2D") public class CTPoint2D { - @XmlAttribute(required = true) + @XmlAttribute(name = "x", required = true) protected long x; - @XmlAttribute(required = true) + @XmlAttribute(name = "y", required = true) protected long y; /** Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPoint3D.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPoint3D.java?rev=1823910&r1=1823909&r2=1823910&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPoint3D.java (original) +++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPoint3D.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_Point3D"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> - * <attribute name="x" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate"; /> - * <attribute name="y" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate"; /> - * <attribute name="z" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate"; /> - * </restriction> - * </complexContent> - * </complexType> + * <complexType name="CT_Point3D"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <attribute name="x" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate"; /> + * <attribute name="y" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate"; /> + * <attribute name="z" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate"; /> + * </restriction> + * </complexContent> + * </complexType> * </pre> * * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CT_Point3D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) +@XmlType(name = "CT_Point3D") public class CTPoint3D { - @XmlAttribute(required = true) + @XmlAttribute(name = "x", required = true) protected long x; - @XmlAttribute(required = true) + @XmlAttribute(name = "y", required = true) protected long y; - @XmlAttribute(required = true) + @XmlAttribute(name = "z", required = true) protected long z; /** Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPolarAdjustHandle.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPolarAdjustHandle.java?rev=1823910&r1=1823909&r2=1823910&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPolarAdjustHandle.java (original) +++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPolarAdjustHandle.java Sun Feb 11 22:09:58 2018 @@ -32,46 +32,46 @@ import javax.xml.bind.annotation.adapter * <p>The following schema fragment specifies the expected content contained within this class. * * <pre> - * <complexType name="CT_PolarAdjustHandle"> - * <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="gdRefR" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_GeomGuideName"; /> - * <attribute name="minR" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate"; /> - * <attribute name="maxR" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate"; /> - * <attribute name="gdRefAng" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_GeomGuideName"; /> - * <attribute name="minAng" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjAngle"; /> - * <attribute name="maxAng" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjAngle"; /> - * </restriction> - * </complexContent> - * </complexType> + * <complexType name="CT_PolarAdjustHandle"> + * <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="gdRefR" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_GeomGuideName"; /> + * <attribute name="minR" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate"; /> + * <attribute name="maxR" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate"; /> + * <attribute name="gdRefAng" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_GeomGuideName"; /> + * <attribute name="minAng" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjAngle"; /> + * <attribute name="maxAng" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjAngle"; /> + * </restriction> + * </complexContent> + * </complexType> * </pre> * * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CT_PolarAdjustHandle", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { +@XmlType(name = "CT_PolarAdjustHandle", propOrder = { "pos" }) public class CTPolarAdjustHandle { - @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, required = true) + @XmlElement(required = true) protected CTAdjPoint2D pos; - @XmlAttribute + @XmlAttribute(name = "gdRefR") @XmlJavaTypeAdapter(CollapsedStringAdapter.class) protected String gdRefR; - @XmlAttribute + @XmlAttribute(name = "minR") protected String minR; - @XmlAttribute + @XmlAttribute(name = "maxR") protected String maxR; - @XmlAttribute + @XmlAttribute(name = "gdRefAng") @XmlJavaTypeAdapter(CollapsedStringAdapter.class) protected String gdRefAng; - @XmlAttribute + @XmlAttribute(name = "minAng") protected String minAng; - @XmlAttribute + @XmlAttribute(name = "maxAng") protected String maxAng; /** Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedAngle.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedAngle.java?rev=1823910&r1=1823909&r2=1823910&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedAngle.java (original) +++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedAngle.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_PositiveFixedAngle"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> - * <attribute name="val" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveFixedAngle"; /> - * </restriction> - * </complexContent> - * </complexType> + * <complexType name="CT_PositiveFixedAngle"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <attribute name="val" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveFixedAngle"; /> + * </restriction> + * </complexContent> + * </complexType> * </pre> * * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CT_PositiveFixedAngle", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) +@XmlType(name = "CT_PositiveFixedAngle") public class CTPositiveFixedAngle { - @XmlAttribute(required = true) + @XmlAttribute(name = "val", required = true) protected int val; /** Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedPercentage.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedPercentage.java?rev=1823910&r1=1823909&r2=1823910&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedPercentage.java (original) +++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositiveFixedPercentage.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_PositiveFixedPercentage"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> - * <attribute name="val" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveFixedPercentage"; /> - * </restriction> - * </complexContent> - * </complexType> + * <complexType name="CT_PositiveFixedPercentage"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <attribute name="val" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveFixedPercentage"; /> + * </restriction> + * </complexContent> + * </complexType> * </pre> * * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CT_PositiveFixedPercentage", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) +@XmlType(name = "CT_PositiveFixedPercentage") public class CTPositiveFixedPercentage { - @XmlAttribute(required = true) + @XmlAttribute(name = "val", required = true) protected int val; /** Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositivePercentage.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositivePercentage.java?rev=1823910&r1=1823909&r2=1823910&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositivePercentage.java (original) +++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositivePercentage.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_PositivePercentage"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> - * <attribute name="val" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositivePercentage"; /> - * </restriction> - * </complexContent> - * </complexType> + * <complexType name="CT_PositivePercentage"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <attribute name="val" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositivePercentage"; /> + * </restriction> + * </complexContent> + * </complexType> * </pre> * * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CT_PositivePercentage", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) +@XmlType(name = "CT_PositivePercentage") public class CTPositivePercentage { - @XmlAttribute(required = true) + @XmlAttribute(name = "val", required = true) protected int val; /** Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositiveSize2D.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositiveSize2D.java?rev=1823910&r1=1823909&r2=1823910&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositiveSize2D.java (original) +++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPositiveSize2D.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_PositiveSize2D"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> - * <attribute name="cx" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveCoordinate"; /> - * <attribute name="cy" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveCoordinate"; /> - * </restriction> - * </complexContent> - * </complexType> + * <complexType name="CT_PositiveSize2D"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <attribute name="cx" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveCoordinate"; /> + * <attribute name="cy" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveCoordinate"; /> + * </restriction> + * </complexContent> + * </complexType> * </pre> * * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CT_PositiveSize2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) +@XmlType(name = "CT_PositiveSize2D") public class CTPositiveSize2D { - @XmlAttribute(required = true) + @XmlAttribute(name = "cx", required = true) protected long cx; - @XmlAttribute(required = true) + @XmlAttribute(name = "cy", required = true) protected long cy; /** Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPresetColor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPresetColor.java?rev=1823910&r1=1823909&r2=1823910&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPresetColor.java (original) +++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPresetColor.java Sun Feb 11 22:09:58 2018 @@ -34,58 +34,58 @@ import javax.xml.bind.annotation.XmlType * <p>The following schema fragment specifies the expected content contained within this class. * * <pre> - * <complexType name="CT_PresetColor"> - * <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="val" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PresetColorVal"; /> - * </restriction> - * </complexContent> - * </complexType> + * <complexType name="CT_PresetColor"> + * <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="val" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PresetColorVal"; /> + * </restriction> + * </complexContent> + * </complexType> * </pre> * * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CT_PresetColor", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { +@XmlType(name = "CT_PresetColor", propOrder = { "egColorTransform" }) public class CTPresetColor { @XmlElementRefs({ - @XmlElementRef(name = "shade", 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 = "blue", 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 = "alphaMod", 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 = "green", 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 = "gray", 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 = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class), - @XmlElementRef(name = "comp", 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 = "greenOff", 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 = "redMod", 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 = "lumMod", 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 = "alphaOff", 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 = "inv", 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 = "gamma", 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 = "satMod", 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 = "blueMod", 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, 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 + @XmlAttribute(name = "val") protected STPresetColorVal val; /** @@ -106,32 +106,32 @@ public class CTPresetColor { * * <p> * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@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 CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >} - * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@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 CTPositiveFixedPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >} - * {@link JAXBElement }{@code <}{@link CTAngle }{@code >} + * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >} - * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * @@ -139,7 +139,7 @@ public class CTPresetColor { */ 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/CTPresetGeometry2D.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPresetGeometry2D.java?rev=1823910&r1=1823909&r2=1823910&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPresetGeometry2D.java (original) +++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPresetGeometry2D.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,29 +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_PresetGeometry2D"> - * <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"/> - * </sequence> - * <attribute name="prst" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_ShapeType"; /> - * </restriction> - * </complexContent> - * </complexType> + * <complexType name="CT_PresetGeometry2D"> + * <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"/> + * </sequence> + * <attribute name="prst" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_ShapeType"; /> + * </restriction> + * </complexContent> + * </complexType> * </pre> * * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CT_PresetGeometry2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { +@XmlType(name = "CT_PresetGeometry2D", propOrder = { "avLst" }) public class CTPresetGeometry2D { - @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) protected CTGeomGuideList avLst; - @XmlAttribute(required = true) + @XmlAttribute(name = "prst", required = true) protected STShapeType prst; /** Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPresetTextShape.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPresetTextShape.java?rev=1823910&r1=1823909&r2=1823910&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPresetTextShape.java (original) +++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTPresetTextShape.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,29 +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_PresetTextShape"> - * <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"/> - * </sequence> - * <attribute name="prst" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_TextShapeType"; /> - * </restriction> - * </complexContent> - * </complexType> + * <complexType name="CT_PresetTextShape"> + * <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"/> + * </sequence> + * <attribute name="prst" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_TextShapeType"; /> + * </restriction> + * </complexContent> + * </complexType> * </pre> * * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CT_PresetTextShape", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { +@XmlType(name = "CT_PresetTextShape", propOrder = { "avLst" }) public class CTPresetTextShape { - @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) protected CTGeomGuideList avLst; - @XmlAttribute(required = true) + @XmlAttribute(name = "prst", required = true) protected STTextShapeType prst; /** Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTRatio.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTRatio.java?rev=1823910&r1=1823909&r2=1823910&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTRatio.java (original) +++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTRatio.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_Ratio"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> - * <attribute name="n" use="required" type="{http://www.w3.org/2001/XMLSchema}long"; /> - * <attribute name="d" use="required" type="{http://www.w3.org/2001/XMLSchema}long"; /> - * </restriction> - * </complexContent> - * </complexType> + * <complexType name="CT_Ratio"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <attribute name="n" use="required" type="{http://www.w3.org/2001/XMLSchema}long"; /> + * <attribute name="d" use="required" type="{http://www.w3.org/2001/XMLSchema}long"; /> + * </restriction> + * </complexContent> + * </complexType> * </pre> * * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CT_Ratio", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) +@XmlType(name = "CT_Ratio") public class CTRatio { - @XmlAttribute(required = true) + @XmlAttribute(name = "n", required = true) protected long n; - @XmlAttribute(required = true) + @XmlAttribute(name = "d", required = true) protected long d; /** Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTRelativeRect.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTRelativeRect.java?rev=1823910&r1=1823909&r2=1823910&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTRelativeRect.java (original) +++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTRelativeRect.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_RelativeRect"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> - * <attribute name="l" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage"; default="0" /> - * <attribute name="t" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage"; default="0" /> - * <attribute name="r" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage"; default="0" /> - * <attribute name="b" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage"; default="0" /> - * </restriction> - * </complexContent> - * </complexType> + * <complexType name="CT_RelativeRect"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <attribute name="l" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage"; default="0" /> + * <attribute name="t" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage"; default="0" /> + * <attribute name="r" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage"; default="0" /> + * <attribute name="b" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage"; default="0" /> + * </restriction> + * </complexContent> + * </complexType> * </pre> * * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CT_RelativeRect", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) +@XmlType(name = "CT_RelativeRect") public class CTRelativeRect { - @XmlAttribute + @XmlAttribute(name = "l") protected Integer l; - @XmlAttribute + @XmlAttribute(name = "t") protected Integer t; - @XmlAttribute + @XmlAttribute(name = "r") protected Integer r; - @XmlAttribute + @XmlAttribute(name = "b") protected Integer b; /** Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSRgbColor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSRgbColor.java?rev=1823910&r1=1823909&r2=1823910&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSRgbColor.java (original) +++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSRgbColor.java Sun Feb 11 22:09:58 2018 @@ -36,58 +36,58 @@ import javax.xml.bind.annotation.adapter * <p>The following schema fragment specifies the expected content contained within this class. * * <pre> - * <complexType name="CT_SRgbColor"> - * <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="val" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_HexBinary3"; /> - * </restriction> - * </complexContent> - * </complexType> + * <complexType name="CT_SRgbColor"> + * <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="val" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_HexBinary3"; /> + * </restriction> + * </complexContent> + * </complexType> * </pre> * * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CT_SRgbColor", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { +@XmlType(name = "CT_SRgbColor", propOrder = { "egColorTransform" }) public class CTSRgbColor { @XmlElementRefs({ - @XmlElementRef(name = "shade", 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 = "invGamma", 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 = "lumOff", 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 = "hueMod", 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 = "alpha", 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 = "hueOff", 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 = "alphaOff", 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 = "gray", 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 = "blue", 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 = "hue", 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 = "tint", 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 = "lumMod", 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 = "comp", 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 = "greenMod", 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, 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(required = true) + @XmlAttribute(name = "val", required = true) @XmlJavaTypeAdapter(HexBinaryAdapter.class) protected byte[] val; @@ -109,40 +109,40 @@ public class CTSRgbColor { * * <p> * Objects of the following type(s) are allowed in the list - * {@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 CTGammaTransform }{@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 CTPositiveFixedPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTAngle }{@code >} - * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@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 CTGammaTransform }{@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 CTComplementTransform }{@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<>(); + egColorTransform = new ArrayList<JAXBElement<?>>(); } return this.egColorTransform; } @@ -176,7 +176,7 @@ public class CTSRgbColor { * */ public void setVal(byte[] value) { - this.val = (value != null) ? value.clone() : null; + this.val = value; } public boolean isSetVal() { Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTScRgbColor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTScRgbColor.java?rev=1823910&r1=1823909&r2=1823910&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTScRgbColor.java (original) +++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTScRgbColor.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_ScRgbColor"> - * <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="r" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage"; /> - * <attribute name="g" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage"; /> - * <attribute name="b" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage"; /> - * </restriction> - * </complexContent> - * </complexType> + * <complexType name="CT_ScRgbColor"> + * <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="r" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage"; /> + * <attribute name="g" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage"; /> + * <attribute name="b" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Percentage"; /> + * </restriction> + * </complexContent> + * </complexType> * </pre> * * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CT_ScRgbColor", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { +@XmlType(name = "CT_ScRgbColor", propOrder = { "egColorTransform" }) public class CTScRgbColor { @XmlElementRefs({ - @XmlElementRef(name = "sat", 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 = "lumMod", 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 = "gray", 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 = "alphaMod", 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 = "blue", 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 = "comp", 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 = "redOff", 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 = "satOff", 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 = "green", 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 = "greenOff", 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 = "lum", 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 = "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 = "greenMod", 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 = "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 = "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(required = true) + @XmlAttribute(name = "r", required = true) protected int r; - @XmlAttribute(required = true) + @XmlAttribute(name = "g", required = true) protected int g; - @XmlAttribute(required = true) + @XmlAttribute(name = "b", required = true) protected int b; /** @@ -112,40 +112,40 @@ public class CTScRgbColor { * * <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 CTGrayscaleTransform }{@code >} * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@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 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 CTPositiveFixedPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >} - * {@link JAXBElement }{@code <}{@link CTAngle }{@code >} - * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >} + * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@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 >} * * */ 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/CTScale2D.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTScale2D.java?rev=1823910&r1=1823909&r2=1823910&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTScale2D.java (original) +++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTScale2D.java Sun Feb 11 22:09:58 2018 @@ -29,30 +29,30 @@ import javax.xml.bind.annotation.XmlType * <p>The following schema fragment specifies the expected content contained within this class. * * <pre> - * <complexType name="CT_Scale2D"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> - * <sequence> - * <element name="sx" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Ratio"/> - * <element name="sy" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Ratio"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> + * <complexType name="CT_Scale2D"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="sx" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Ratio"/> + * <element name="sy" type="{http://schemas.openxmlformats.org/drawingml/2006/main}CT_Ratio"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> * </pre> * * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CT_Scale2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { +@XmlType(name = "CT_Scale2D", propOrder = { "sx", "sy" }) public class CTScale2D { - @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, required = true) + @XmlElement(required = true) protected CTRatio sx; - @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, required = true) + @XmlElement(required = true) protected CTRatio sy; /** --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
