Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSchemeColor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSchemeColor.java?rev=1823910&r1=1823909&r2=1823910&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSchemeColor.java (original) +++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSchemeColor.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_SchemeColor"> - * <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_SchemeColorVal"; /> - * </restriction> - * </complexContent> - * </complexType> + * <complexType name="CT_SchemeColor"> + * <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_SchemeColorVal"; /> + * </restriction> + * </complexContent> + * </complexType> * </pre> * * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CT_SchemeColor", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { +@XmlType(name = "CT_SchemeColor", propOrder = { "egColorTransform" }) public class CTSchemeColor { @XmlElementRefs({ - @XmlElementRef(name = "redMod", 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 = "comp", 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 = "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 = "alpha", 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 = "greenOff", 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), - @XmlElementRef(name = "inv", 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 = "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 = "alphaMod", 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 = "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 = "lum", 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 = "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), - @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, required = false), + @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false) }) protected List<JAXBElement<?>> egColorTransform; - @XmlAttribute(required = true) + @XmlAttribute(name = "val", required = true) protected STSchemeColorVal val; /** @@ -106,40 +106,40 @@ public class CTSchemeColor { * * <p> * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >} - * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >} + * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >} * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTAngle }{@code >} + * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >} + * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >} + * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >} + * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTAngle }{@code >} - * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >} - * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * * */ public List<JAXBElement<?>> getEGColorTransform() { if (egColorTransform == null) { - egColorTransform = new ArrayList<>(); + egColorTransform = new ArrayList<JAXBElement<?>>(); } return this.egColorTransform; }
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSphereCoords.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSphereCoords.java?rev=1823910&r1=1823909&r2=1823910&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSphereCoords.java (original) +++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSphereCoords.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_SphereCoords"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> - * <attribute name="lat" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveFixedAngle"; /> - * <attribute name="lon" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveFixedAngle"; /> - * <attribute name="rev" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveFixedAngle"; /> - * </restriction> - * </complexContent> - * </complexType> + * <complexType name="CT_SphereCoords"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <attribute name="lat" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveFixedAngle"; /> + * <attribute name="lon" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveFixedAngle"; /> + * <attribute name="rev" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_PositiveFixedAngle"; /> + * </restriction> + * </complexContent> + * </complexType> * </pre> * * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CT_SphereCoords", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) +@XmlType(name = "CT_SphereCoords") public class CTSphereCoords { - @XmlAttribute(required = true) + @XmlAttribute(name = "lat", required = true) protected int lat; - @XmlAttribute(required = true) + @XmlAttribute(name = "lon", required = true) protected int lon; - @XmlAttribute(required = true) + @XmlAttribute(name = "rev", required = true) protected int rev; /** Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSystemColor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSystemColor.java?rev=1823910&r1=1823909&r2=1823910&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSystemColor.java (original) +++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTSystemColor.java Sun Feb 11 22:09:58 2018 @@ -37,62 +37,62 @@ import javax.xml.bind.annotation.adapter * <p>The following schema fragment specifies the expected content contained within this class. * * <pre> - * <complexType name="CT_SystemColor"> - * <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_SystemColorVal"; /> - * <attribute name="lastClr" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_HexBinary3"; /> - * </restriction> - * </complexContent> - * </complexType> + * <complexType name="CT_SystemColor"> + * <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_SystemColorVal"; /> + * <attribute name="lastClr" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_HexBinary3"; /> + * </restriction> + * </complexContent> + * </complexType> * </pre> * * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CT_SystemColor", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { +@XmlType(name = "CT_SystemColor", propOrder = { "egColorTransform" }) public class CTSystemColor { @XmlElementRefs({ - @XmlElementRef(name = "gray", 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 = "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 = "lumMod", 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 = "redMod", 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 = "sat", 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 = "red", 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 = "hueMod", 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 = "gamma", 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 = "hue", 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 = "lum", 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 = "invGamma", 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 = "alpha", 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 = "inv", 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 = "tint", 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 = "red", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "invGamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "inv", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "blueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "hue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "gamma", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "lumOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "blueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "satMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "hueMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "alpha", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), + @XmlElementRef(name = "comp", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false) }) protected List<JAXBElement<?>> egColorTransform; - @XmlAttribute(required = true) + @XmlAttribute(name = "val", required = true) @XmlJavaTypeAdapter(CollapsedStringAdapter.class) protected String val; - @XmlAttribute + @XmlAttribute(name = "lastClr") @XmlJavaTypeAdapter(HexBinaryAdapter.class) protected byte[] lastClr; @@ -114,40 +114,40 @@ public class CTSystemColor { * * <p> * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >} + * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >} + * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >} * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >} - * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >} * {@link JAXBElement }{@code <}{@link CTAngle }{@code >} - * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@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 CTComplementTransform }{@code >} * * */ public List<JAXBElement<?>> getEGColorTransform() { if (egColorTransform == null) { - egColorTransform = new ArrayList<>(); + egColorTransform = new ArrayList<JAXBElement<?>>(); } return this.egColorTransform; } @@ -209,7 +209,7 @@ public class CTSystemColor { * */ public void setLastClr(byte[] value) { - this.lastClr = (value != null) ? value.clone() : null; + this.lastClr = value; } public boolean isSetLastClr() { Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTTransform2D.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTTransform2D.java?rev=1823910&r1=1823909&r2=1823910&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTTransform2D.java (original) +++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTTransform2D.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,39 +29,37 @@ import javax.xml.bind.annotation.XmlType * <p>The following schema fragment specifies the expected content contained within this class. * * <pre> - * <complexType name="CT_Transform2D"> - * <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"/> - * </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_Transform2D"> + * <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"/> + * </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_Transform2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { +@XmlType(name = "CT_Transform2D", propOrder = { "off", "ext" }) public class CTTransform2D { - @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) protected CTPoint2D off; - @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) protected CTPositiveSize2D ext; - @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/CTVector3D.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTVector3D.java?rev=1823910&r1=1823909&r2=1823910&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTVector3D.java (original) +++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTVector3D.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_Vector3D"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> - * <attribute name="dx" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate"; /> - * <attribute name="dy" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate"; /> - * <attribute name="dz" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate"; /> - * </restriction> - * </complexContent> - * </complexType> + * <complexType name="CT_Vector3D"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <attribute name="dx" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate"; /> + * <attribute name="dy" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate"; /> + * <attribute name="dz" use="required" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_Coordinate"; /> + * </restriction> + * </complexContent> + * </complexType> * </pre> * * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CT_Vector3D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) +@XmlType(name = "CT_Vector3D") public class CTVector3D { - @XmlAttribute(required = true) + @XmlAttribute(name = "dx", required = true) protected long dx; - @XmlAttribute(required = true) + @XmlAttribute(name = "dy", required = true) protected long dy; - @XmlAttribute(required = true) + @XmlAttribute(name = "dz", required = true) protected long dz; /** Modified: poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTXYAdjustHandle.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTXYAdjustHandle.java?rev=1823910&r1=1823909&r2=1823910&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTXYAdjustHandle.java (original) +++ poi/trunk/src/java/org/apache/poi/sl/draw/binding/CTXYAdjustHandle.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_XYAdjustHandle"> - * <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="gdRefX" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_GeomGuideName"; /> - * <attribute name="minX" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate"; /> - * <attribute name="maxX" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate"; /> - * <attribute name="gdRefY" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_GeomGuideName"; /> - * <attribute name="minY" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate"; /> - * <attribute name="maxY" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate"; /> - * </restriction> - * </complexContent> - * </complexType> + * <complexType name="CT_XYAdjustHandle"> + * <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="gdRefX" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_GeomGuideName"; /> + * <attribute name="minX" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate"; /> + * <attribute name="maxX" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate"; /> + * <attribute name="gdRefY" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_GeomGuideName"; /> + * <attribute name="minY" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate"; /> + * <attribute name="maxY" type="{http://schemas.openxmlformats.org/drawingml/2006/main}ST_AdjCoordinate"; /> + * </restriction> + * </complexContent> + * </complexType> * </pre> * * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CT_XYAdjustHandle", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { +@XmlType(name = "CT_XYAdjustHandle", propOrder = { "pos" }) public class CTXYAdjustHandle { - @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, required = true) + @XmlElement(required = true) protected CTAdjPoint2D pos; - @XmlAttribute + @XmlAttribute(name = "gdRefX") @XmlJavaTypeAdapter(CollapsedStringAdapter.class) protected String gdRefX; - @XmlAttribute + @XmlAttribute(name = "minX") protected String minX; - @XmlAttribute + @XmlAttribute(name = "maxX") protected String maxX; - @XmlAttribute + @XmlAttribute(name = "gdRefY") @XmlJavaTypeAdapter(CollapsedStringAdapter.class) protected String gdRefY; - @XmlAttribute + @XmlAttribute(name = "minY") protected String minY; - @XmlAttribute + @XmlAttribute(name = "maxY") protected String maxY; /** --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
