Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSchemeColor.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSchemeColor.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSchemeColor.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSchemeColor.java Wed Jul 8 00:09:34 2015 @@ -25,11 +25,7 @@ import javax.xml.bind.annotation.XmlAcce import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElementRef; import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; -import com.sun.xml.internal.bind.Locatable; -import com.sun.xml.internal.bind.annotation.XmlLocation; -import org.xml.sax.Locator; /** @@ -56,45 +52,41 @@ import org.xml.sax.Locator; @XmlType(name = "CT_SchemeColor", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { "egColorTransform" }) -public class CTSchemeColor implements Locatable -{ +public class CTSchemeColor { @XmlElementRefs({ - @XmlElementRef(name = "gamma", 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 = "hue", 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 = "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 = "satOff", 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 = "alpha", 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 = "red", 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 = "satMod", 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 = "alphaMod", 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 = "lum", 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 = "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 = "gray", 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 = "redMod", 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 = "greenMod", 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), + @XmlElementRef(name = "gray", 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 = "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 = "blue", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class), + @XmlElementRef(name = "lumMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class), + @XmlElementRef(name = "redOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class), + @XmlElementRef(name = "hueMod", 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 = "tint", 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 = "blueMod", 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 = "hueOff", 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 = "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 = "hue", 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 = "lumOff", 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 = "shade", 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 = "inv", 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) }) protected List<JAXBElement<?>> egColorTransform; - @XmlAttribute(name = "val", required = true) + @XmlAttribute(required = true) protected STSchemeColorVal val; - @XmlLocation - @XmlTransient - protected Locator locator; /** * Gets the value of the egColorTransform property. @@ -115,32 +107,32 @@ public class CTSchemeColor implements Lo * <p> * Objects of the following type(s) are allowed in the list * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >} - * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >} - * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >} - * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@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 CTPercentage }{@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 CTPositivePercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTAngle }{@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 CTGrayscaleTransform }{@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 CTComplementTransform }{@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 >} * * @@ -188,12 +180,4 @@ public class CTSchemeColor implements Lo return (this.val!= null); } - public Locator sourceLocation() { - return locator; - } - - public void setSourceLocation(Locator newLocator) { - locator = newLocator; - } - }
Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSphereCoords.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSphereCoords.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSphereCoords.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSphereCoords.java Wed Jul 8 00:09:34 2015 @@ -20,11 +20,7 @@ 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.XmlTransient; import javax.xml.bind.annotation.XmlType; -import com.sun.xml.internal.bind.Locatable; -import com.sun.xml.internal.bind.annotation.XmlLocation; -import org.xml.sax.Locator; /** @@ -48,19 +44,14 @@ import org.xml.sax.Locator; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "CT_SphereCoords", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) -public class CTSphereCoords - implements Locatable -{ +public class CTSphereCoords { - @XmlAttribute(name = "lat", required = true) + @XmlAttribute(required = true) protected int lat; - @XmlAttribute(name = "lon", required = true) + @XmlAttribute(required = true) protected int lon; - @XmlAttribute(name = "rev", required = true) + @XmlAttribute(required = true) protected int rev; - @XmlLocation - @XmlTransient - protected Locator locator; /** * Gets the value of the lat property. @@ -122,12 +113,4 @@ public class CTSphereCoords return true; } - public Locator sourceLocation() { - return locator; - } - - public void setSourceLocation(Locator newLocator) { - locator = newLocator; - } - } Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSystemColor.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSystemColor.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSystemColor.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSystemColor.java Wed Jul 8 00:09:34 2015 @@ -25,14 +25,10 @@ import javax.xml.bind.annotation.XmlAcce import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElementRef; import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; import javax.xml.bind.annotation.adapters.HexBinaryAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import com.sun.xml.internal.bind.Locatable; -import com.sun.xml.internal.bind.annotation.XmlLocation; -import org.xml.sax.Locator; /** @@ -60,49 +56,45 @@ import org.xml.sax.Locator; @XmlType(name = "CT_SystemColor", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { "egColorTransform" }) -public class CTSystemColor implements Locatable -{ +public class CTSystemColor { @XmlElementRefs({ - @XmlElementRef(name = "alpha", 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 = "lumOff", 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 = "blueMod", 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 = "shade", 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 = "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 = "gamma", 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 = "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 = "satOff", 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 = "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 = "lumMod", 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 = "hueMod", 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 = "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 = "green", 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 = "greenOff", 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), + @XmlElementRef(name = "alpha", 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 = "inv", 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 = "redMod", 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 = "greenOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class), + @XmlElementRef(name = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class), + @XmlElementRef(name = "lumOff", 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 = "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 = "hueMod", 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 = "greenMod", 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 = "comp", 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 = "invGamma", 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 = "gamma", 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 = "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 = "sat", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class) }) protected List<JAXBElement<?>> egColorTransform; - @XmlAttribute(name = "val", required = true) + @XmlAttribute(required = true) @XmlJavaTypeAdapter(CollapsedStringAdapter.class) protected String val; - @XmlAttribute(name = "lastClr") + @XmlAttribute @XmlJavaTypeAdapter(HexBinaryAdapter.class) protected byte[] lastClr; - @XmlLocation - @XmlTransient - protected Locator locator; /** * Gets the value of the egColorTransform property. @@ -122,34 +114,34 @@ public class CTSystemColor implements Lo * * <p> * Objects of the following type(s) are allowed in the list + * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >} * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@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 CTInverseTransform }{@code >} - * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTAngle }{@code >} + * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >} + * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@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 CTInverseGammaTransform }{@code >} + * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@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 CTPositivePercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * * */ @@ -217,19 +209,11 @@ public class CTSystemColor implements Lo * */ public void setLastClr(byte[] value) { - this.lastClr = value; + this.lastClr = ((byte[]) value); } public boolean isSetLastClr() { return (this.lastClr!= null); } - public Locator sourceLocation() { - return locator; - } - - public void setSourceLocation(Locator newLocator) { - locator = newLocator; - } - } Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTTransform2D.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTTransform2D.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTTransform2D.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTTransform2D.java Wed Jul 8 00:09:34 2015 @@ -21,11 +21,7 @@ import javax.xml.bind.annotation.XmlAcce import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; -import com.sun.xml.internal.bind.Locatable; -import com.sun.xml.internal.bind.annotation.XmlLocation; -import org.xml.sax.Locator; /** @@ -56,23 +52,18 @@ import org.xml.sax.Locator; "off", "ext" }) -public class CTTransform2D - implements Locatable -{ +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(name = "rot") + @XmlAttribute protected Integer rot; - @XmlAttribute(name = "flipH") + @XmlAttribute protected Boolean flipH; - @XmlAttribute(name = "flipV") + @XmlAttribute protected Boolean flipV; - @XmlLocation - @XmlTransient - protected Locator locator; /** * Gets the value of the off property. @@ -238,12 +229,4 @@ public class CTTransform2D this.flipV = null; } - public Locator sourceLocation() { - return locator; - } - - public void setSourceLocation(Locator newLocator) { - locator = newLocator; - } - } Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTVector3D.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTVector3D.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTVector3D.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTVector3D.java Wed Jul 8 00:09:34 2015 @@ -20,11 +20,7 @@ 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.XmlTransient; import javax.xml.bind.annotation.XmlType; -import com.sun.xml.internal.bind.Locatable; -import com.sun.xml.internal.bind.annotation.XmlLocation; -import org.xml.sax.Locator; /** @@ -48,19 +44,14 @@ import org.xml.sax.Locator; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "CT_Vector3D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) -public class CTVector3D - implements Locatable -{ +public class CTVector3D { - @XmlAttribute(name = "dx", required = true) + @XmlAttribute(required = true) protected long dx; - @XmlAttribute(name = "dy", required = true) + @XmlAttribute(required = true) protected long dy; - @XmlAttribute(name = "dz", required = true) + @XmlAttribute(required = true) protected long dz; - @XmlLocation - @XmlTransient - protected Locator locator; /** * Gets the value of the dx property. @@ -122,12 +113,4 @@ public class CTVector3D return true; } - public Locator sourceLocation() { - return locator; - } - - public void setSourceLocation(Locator newLocator) { - locator = newLocator; - } - } Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTXYAdjustHandle.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTXYAdjustHandle.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTXYAdjustHandle.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTXYAdjustHandle.java Wed Jul 8 00:09:34 2015 @@ -21,13 +21,9 @@ import javax.xml.bind.annotation.XmlAcce import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import com.sun.xml.internal.bind.Locatable; -import com.sun.xml.internal.bind.annotation.XmlLocation; -import org.xml.sax.Locator; /** @@ -59,28 +55,24 @@ import org.xml.sax.Locator; @XmlType(name = "CT_XYAdjustHandle", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { "pos" }) -public class CTXYAdjustHandle implements Locatable -{ +public class CTXYAdjustHandle { @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, required = true) protected CTAdjPoint2D pos; - @XmlAttribute(name = "gdRefX") + @XmlAttribute @XmlJavaTypeAdapter(CollapsedStringAdapter.class) protected String gdRefX; - @XmlAttribute(name = "minX") + @XmlAttribute protected String minX; - @XmlAttribute(name = "maxX") + @XmlAttribute protected String maxX; - @XmlAttribute(name = "gdRefY") + @XmlAttribute @XmlJavaTypeAdapter(CollapsedStringAdapter.class) protected String gdRefY; - @XmlAttribute(name = "minY") + @XmlAttribute protected String minY; - @XmlAttribute(name = "maxY") + @XmlAttribute protected String maxY; - @XmlLocation - @XmlTransient - protected Locator locator; /** * Gets the value of the pos property. @@ -278,12 +270,4 @@ public class CTXYAdjustHandle implements return (this.maxY!= null); } - public Locator sourceLocation() { - return locator; - } - - public void setSourceLocation(Locator newLocator) { - locator = newLocator; - } - } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
