Modified: poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTOfficeArtExtensionList.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTOfficeArtExtensionList.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTOfficeArtExtensionList.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTOfficeArtExtensionList.java Wed Jul 8 00:09:34 2015 @@ -22,11 +22,7 @@ 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.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; /** @@ -52,15 +48,10 @@ import org.xml.sax.Locator; @XmlType(name = "CT_OfficeArtExtensionList", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { "ext" }) -public class CTOfficeArtExtensionList - implements Locatable -{ +public class CTOfficeArtExtensionList { @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) protected List<CTOfficeArtExtension> ext; - @XmlLocation - @XmlTransient - protected Locator locator; /** * Gets the value of the ext property. @@ -99,12 +90,4 @@ public class CTOfficeArtExtensionList this.ext = 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/CTPath2D.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2D.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2D.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2D.java Wed Jul 8 00:09:34 2015 @@ -24,11 +24,7 @@ import javax.xml.bind.annotation.XmlAcce import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElements; -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; /** @@ -64,32 +60,27 @@ import org.xml.sax.Locator; @XmlType(name = "CT_Path2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { "closeOrMoveToOrLnTo" }) -public class CTPath2D - implements Locatable -{ +public class CTPath2D { @XmlElements({ - @XmlElement(name = "close", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = CTPath2DClose.class), @XmlElement(name = "moveTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = CTPath2DMoveTo.class), - @XmlElement(name = "lnTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = CTPath2DLineTo.class), - @XmlElement(name = "arcTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = CTPath2DArcTo.class), @XmlElement(name = "quadBezTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = CTPath2DQuadBezierTo.class), - @XmlElement(name = "cubicBezTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = CTPath2DCubicBezierTo.class) + @XmlElement(name = "cubicBezTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = CTPath2DCubicBezierTo.class), + @XmlElement(name = "arcTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = CTPath2DArcTo.class), + @XmlElement(name = "lnTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = CTPath2DLineTo.class), + @XmlElement(name = "close", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = CTPath2DClose.class) }) protected List<Object> closeOrMoveToOrLnTo; - @XmlAttribute(name = "w") + @XmlAttribute protected Long w; - @XmlAttribute(name = "h") + @XmlAttribute protected Long h; - @XmlAttribute(name = "fill") + @XmlAttribute protected STPathFillMode fill; - @XmlAttribute(name = "stroke") + @XmlAttribute protected Boolean stroke; - @XmlAttribute(name = "extrusionOk") + @XmlAttribute protected Boolean extrusionOk; - @XmlLocation - @XmlTransient - protected Locator locator; /** * Gets the value of the closeOrMoveToOrLnTo property. @@ -109,12 +100,12 @@ public class CTPath2D * * <p> * Objects of the following type(s) are allowed in the list - * {@link CTPath2DClose } * {@link CTPath2DMoveTo } - * {@link CTPath2DLineTo } - * {@link CTPath2DArcTo } * {@link CTPath2DQuadBezierTo } * {@link CTPath2DCubicBezierTo } + * {@link CTPath2DArcTo } + * {@link CTPath2DLineTo } + * {@link CTPath2DClose } * * */ @@ -309,12 +300,4 @@ public class CTPath2D this.extrusionOk = 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/CTPath2DArcTo.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DArcTo.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DArcTo.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DArcTo.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; /** @@ -49,20 +45,16 @@ import org.xml.sax.Locator; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "CT_Path2DArcTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) -public class CTPath2DArcTo implements Locatable -{ +public class CTPath2DArcTo { @XmlAttribute(name = "wR", required = true) protected String wr; @XmlAttribute(name = "hR", required = true) protected String hr; - @XmlAttribute(name = "stAng", required = true) + @XmlAttribute(required = true) protected String stAng; - @XmlAttribute(name = "swAng", required = true) + @XmlAttribute(required = true) protected String swAng; - @XmlLocation - @XmlTransient - protected Locator locator; /** * Gets the value of the wr property. @@ -176,12 +168,4 @@ public class CTPath2DArcTo implements Lo return (this.swAng!= 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/CTPath2DClose.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DClose.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DClose.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DClose.java Wed Jul 8 00:09:34 2015 @@ -19,11 +19,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.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; /** @@ -44,19 +40,7 @@ import org.xml.sax.Locator; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "CT_Path2DClose", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) -public class CTPath2DClose implements Locatable -{ +public class CTPath2DClose { - @XmlLocation - @XmlTransient - protected Locator locator; - - 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/CTPath2DCubicBezierTo.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DCubicBezierTo.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DCubicBezierTo.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DCubicBezierTo.java Wed Jul 8 00:09:34 2015 @@ -22,11 +22,7 @@ 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.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; /** @@ -52,14 +48,10 @@ import org.xml.sax.Locator; @XmlType(name = "CT_Path2DCubicBezierTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { "pt" }) -public class CTPath2DCubicBezierTo implements Locatable -{ +public class CTPath2DCubicBezierTo { @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, required = true) protected List<CTAdjPoint2D> pt; - @XmlLocation - @XmlTransient - protected Locator locator; /** * Gets the value of the pt property. @@ -98,12 +90,4 @@ public class CTPath2DCubicBezierTo imple this.pt = 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/CTPath2DLineTo.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DLineTo.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DLineTo.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DLineTo.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.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; /** @@ -50,14 +46,10 @@ import org.xml.sax.Locator; @XmlType(name = "CT_Path2DLineTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { "pt" }) -public class CTPath2DLineTo implements Locatable -{ +public class CTPath2DLineTo { @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, required = true) protected CTAdjPoint2D pt; - @XmlLocation - @XmlTransient - protected Locator locator; /** * Gets the value of the pt property. @@ -87,12 +79,4 @@ public class CTPath2DLineTo implements L return (this.pt!= 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/CTPath2DList.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DList.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DList.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DList.java Wed Jul 8 00:09:34 2015 @@ -22,11 +22,7 @@ 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.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; /** @@ -52,15 +48,10 @@ import org.xml.sax.Locator; @XmlType(name = "CT_Path2DList", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { "path" }) -public class CTPath2DList - implements Locatable -{ +public class CTPath2DList { @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) protected List<CTPath2D> path; - @XmlLocation - @XmlTransient - protected Locator locator; /** * Gets the value of the path property. @@ -99,12 +90,4 @@ public class CTPath2DList this.path = 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/CTPath2DMoveTo.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DMoveTo.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DMoveTo.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DMoveTo.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.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; /** @@ -50,14 +46,10 @@ import org.xml.sax.Locator; @XmlType(name = "CT_Path2DMoveTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { "pt" }) -public class CTPath2DMoveTo implements Locatable -{ +public class CTPath2DMoveTo { @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, required = true) protected CTAdjPoint2D pt; - @XmlLocation - @XmlTransient - protected Locator locator; /** * Gets the value of the pt property. @@ -87,12 +79,4 @@ public class CTPath2DMoveTo implements L return (this.pt!= 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/CTPath2DQuadBezierTo.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DQuadBezierTo.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DQuadBezierTo.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPath2DQuadBezierTo.java Wed Jul 8 00:09:34 2015 @@ -22,11 +22,7 @@ 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.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; /** @@ -52,14 +48,10 @@ import org.xml.sax.Locator; @XmlType(name = "CT_Path2DQuadBezierTo", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { "pt" }) -public class CTPath2DQuadBezierTo implements Locatable -{ +public class CTPath2DQuadBezierTo { @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, required = true) protected List<CTAdjPoint2D> pt; - @XmlLocation - @XmlTransient - protected Locator locator; /** * Gets the value of the pt property. @@ -98,12 +90,4 @@ public class CTPath2DQuadBezierTo implem this.pt = 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/CTPercentage.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPercentage.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPercentage.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPercentage.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; /** @@ -46,14 +42,10 @@ import org.xml.sax.Locator; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "CT_Percentage", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) -public class CTPercentage implements Locatable -{ +public class CTPercentage { - @XmlAttribute(name = "val", required = true) + @XmlAttribute(required = true) protected int val; - @XmlLocation - @XmlTransient - protected Locator locator; /** * Gets the value of the val property. @@ -75,12 +67,4 @@ public class CTPercentage implements Loc 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/CTPoint2D.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPoint2D.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPoint2D.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPoint2D.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; /** @@ -47,17 +43,12 @@ import org.xml.sax.Locator; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "CT_Point2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) -public class CTPoint2D - implements Locatable -{ +public class CTPoint2D { - @XmlAttribute(name = "x", required = true) + @XmlAttribute(required = true) protected long x; - @XmlAttribute(name = "y", required = true) + @XmlAttribute(required = true) protected long y; - @XmlLocation - @XmlTransient - protected Locator locator; /** * Gets the value of the x property. @@ -99,12 +90,4 @@ public class CTPoint2D 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/CTPoint3D.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPoint3D.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPoint3D.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPoint3D.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_Point3D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) -public class CTPoint3D - implements Locatable -{ +public class CTPoint3D { - @XmlAttribute(name = "x", required = true) + @XmlAttribute(required = true) protected long x; - @XmlAttribute(name = "y", required = true) + @XmlAttribute(required = true) protected long y; - @XmlAttribute(name = "z", required = true) + @XmlAttribute(required = true) protected long z; - @XmlLocation - @XmlTransient - protected Locator locator; /** * Gets the value of the x property. @@ -122,12 +113,4 @@ public class CTPoint3D 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/CTPolarAdjustHandle.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPolarAdjustHandle.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPolarAdjustHandle.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPolarAdjustHandle.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_PolarAdjustHandle", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { "pos" }) -public class CTPolarAdjustHandle implements Locatable -{ +public class CTPolarAdjustHandle { @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, required = true) protected CTAdjPoint2D pos; - @XmlAttribute(name = "gdRefR") + @XmlAttribute @XmlJavaTypeAdapter(CollapsedStringAdapter.class) protected String gdRefR; - @XmlAttribute(name = "minR") + @XmlAttribute protected String minR; - @XmlAttribute(name = "maxR") + @XmlAttribute protected String maxR; - @XmlAttribute(name = "gdRefAng") + @XmlAttribute @XmlJavaTypeAdapter(CollapsedStringAdapter.class) protected String gdRefAng; - @XmlAttribute(name = "minAng") + @XmlAttribute protected String minAng; - @XmlAttribute(name = "maxAng") + @XmlAttribute protected String maxAng; - @XmlLocation - @XmlTransient - protected Locator locator; /** * Gets the value of the pos property. @@ -278,12 +270,4 @@ public class CTPolarAdjustHandle impleme return (this.maxAng!= 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/CTPositiveFixedAngle.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositiveFixedAngle.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositiveFixedAngle.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositiveFixedAngle.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; /** @@ -46,14 +42,10 @@ import org.xml.sax.Locator; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "CT_PositiveFixedAngle", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) -public class CTPositiveFixedAngle implements Locatable -{ +public class CTPositiveFixedAngle { - @XmlAttribute(name = "val", required = true) + @XmlAttribute(required = true) protected int val; - @XmlLocation - @XmlTransient - protected Locator locator; /** * Gets the value of the val property. @@ -75,12 +67,4 @@ public class CTPositiveFixedAngle implem 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/CTPositiveFixedPercentage.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositiveFixedPercentage.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositiveFixedPercentage.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositiveFixedPercentage.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; /** @@ -46,14 +42,10 @@ import org.xml.sax.Locator; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "CT_PositiveFixedPercentage", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) -public class CTPositiveFixedPercentage implements Locatable -{ +public class CTPositiveFixedPercentage { - @XmlAttribute(name = "val", required = true) + @XmlAttribute(required = true) protected int val; - @XmlLocation - @XmlTransient - protected Locator locator; /** * Gets the value of the val property. @@ -75,12 +67,4 @@ public class CTPositiveFixedPercentage i 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/CTPositivePercentage.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositivePercentage.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositivePercentage.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositivePercentage.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; /** @@ -46,14 +42,10 @@ import org.xml.sax.Locator; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "CT_PositivePercentage", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) -public class CTPositivePercentage implements Locatable -{ +public class CTPositivePercentage { - @XmlAttribute(name = "val", required = true) + @XmlAttribute(required = true) protected int val; - @XmlLocation - @XmlTransient - protected Locator locator; /** * Gets the value of the val property. @@ -75,12 +67,4 @@ public class CTPositivePercentage implem 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/CTPositiveSize2D.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositiveSize2D.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositiveSize2D.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPositiveSize2D.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; /** @@ -47,17 +43,12 @@ import org.xml.sax.Locator; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "CT_PositiveSize2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) -public class CTPositiveSize2D - implements Locatable -{ +public class CTPositiveSize2D { - @XmlAttribute(name = "cx", required = true) + @XmlAttribute(required = true) protected long cx; - @XmlAttribute(name = "cy", required = true) + @XmlAttribute(required = true) protected long cy; - @XmlLocation - @XmlTransient - protected Locator locator; /** * Gets the value of the cx property. @@ -99,12 +90,4 @@ public class CTPositiveSize2D 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/CTPresetColor.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPresetColor.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPresetColor.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPresetColor.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_PresetColor", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { "egColorTransform" }) -public class CTPresetColor implements Locatable -{ +public class CTPresetColor { @XmlElementRefs({ - @XmlElementRef(name = "hueMod", 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 = "hue", 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 = "sat", 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 = "alphaOff", 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 = "gamma", 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 = "shade", 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 = "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 = "greenMod", 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 = "lumOff", 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 = "greenOff", 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 = "lumMod", 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 = "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 = "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), + @XmlElementRef(name = "red", 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 = "green", 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 = "lum", 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 = "satMod", 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 = "blueOff", 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 = "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 = "shade", 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 = "redMod", 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 = "inv", 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 = "alpha", 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 = "greenMod", 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 = "hueOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class) }) protected List<JAXBElement<?>> egColorTransform; - @XmlAttribute(name = "val") + @XmlAttribute protected STPresetColorVal val; - @XmlLocation - @XmlTransient - protected Locator locator; /** * Gets the value of the egColorTransform property. @@ -114,34 +106,34 @@ public class CTPresetColor implements Lo * * <p> * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@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 CTPositiveFixedPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >} - * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >} + * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >} * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >} + * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@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 >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@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 CTAngle }{@code >} * * */ @@ -188,12 +180,4 @@ public class CTPresetColor 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/CTPresetGeometry2D.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPresetGeometry2D.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPresetGeometry2D.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPresetGeometry2D.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; /** @@ -52,17 +48,12 @@ import org.xml.sax.Locator; @XmlType(name = "CT_PresetGeometry2D", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { "avLst" }) -public class CTPresetGeometry2D - implements Locatable -{ +public class CTPresetGeometry2D { @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) protected CTGeomGuideList avLst; - @XmlAttribute(name = "prst", required = true) + @XmlAttribute(required = true) protected STShapeType prst; - @XmlLocation - @XmlTransient - protected Locator locator; /** * Gets the value of the avLst property. @@ -120,12 +111,4 @@ public class CTPresetGeometry2D return (this.prst!= 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/CTPresetTextShape.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPresetTextShape.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPresetTextShape.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTPresetTextShape.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; /** @@ -52,17 +48,12 @@ import org.xml.sax.Locator; @XmlType(name = "CT_PresetTextShape", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { "avLst" }) -public class CTPresetTextShape - implements Locatable -{ +public class CTPresetTextShape { @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) protected CTGeomGuideList avLst; - @XmlAttribute(name = "prst", required = true) + @XmlAttribute(required = true) protected STTextShapeType prst; - @XmlLocation - @XmlTransient - protected Locator locator; /** * Gets the value of the avLst property. @@ -120,12 +111,4 @@ public class CTPresetTextShape return (this.prst!= 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/CTRatio.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTRatio.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTRatio.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTRatio.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; /** @@ -47,17 +43,12 @@ import org.xml.sax.Locator; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "CT_Ratio", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) -public class CTRatio - implements Locatable -{ +public class CTRatio { - @XmlAttribute(name = "n", required = true) + @XmlAttribute(required = true) protected long n; - @XmlAttribute(name = "d", required = true) + @XmlAttribute(required = true) protected long d; - @XmlLocation - @XmlTransient - protected Locator locator; /** * Gets the value of the n property. @@ -99,12 +90,4 @@ public class CTRatio 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/CTRelativeRect.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTRelativeRect.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTRelativeRect.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTRelativeRect.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; /** @@ -49,21 +45,16 @@ import org.xml.sax.Locator; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "CT_RelativeRect", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";) -public class CTRelativeRect - implements Locatable -{ +public class CTRelativeRect { - @XmlAttribute(name = "l") + @XmlAttribute protected Integer l; - @XmlAttribute(name = "t") + @XmlAttribute protected Integer t; - @XmlAttribute(name = "r") + @XmlAttribute protected Integer r; - @XmlAttribute(name = "b") + @XmlAttribute protected Integer b; - @XmlLocation - @XmlTransient - protected Locator locator; /** * Gets the value of the l property. @@ -209,12 +200,4 @@ public class CTRelativeRect this.b = 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/CTSRgbColor.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSRgbColor.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSRgbColor.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTSRgbColor.java Wed Jul 8 00:09:34 2015 @@ -25,13 +25,9 @@ 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.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; /** @@ -58,46 +54,42 @@ import org.xml.sax.Locator; @XmlType(name = "CT_SRgbColor", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { "egColorTransform" }) -public class CTSRgbColor implements Locatable -{ +public class CTSRgbColor { @XmlElementRefs({ - @XmlElementRef(name = "red", 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 = "blueMod", 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 = "satOff", 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 = "satMod", 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 = "alpha", 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 = "alphaMod", 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 = "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 = "tint", 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 = "comp", 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 = "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 = "gray", 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 = "hue", 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 = "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 = "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 = "alphaOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class), + @XmlElementRef(name = "redMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class), + @XmlElementRef(name = "alphaMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class), + @XmlElementRef(name = "blueMod", 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 = "inv", 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 = "comp", 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 = "gamma", 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 = "greenMod", 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 = "tint", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class), + @XmlElementRef(name = "satOff", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class), + @XmlElementRef(name = "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 = "lumOff", 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 = "lum", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class), + @XmlElementRef(name = "gray", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class), + @XmlElementRef(name = "hueMod", 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 = "green", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class) }) protected List<JAXBElement<?>> egColorTransform; - @XmlAttribute(name = "val", required = true) + @XmlAttribute(required = true) @XmlJavaTypeAdapter(HexBinaryAdapter.class) protected byte[] val; - @XmlLocation - @XmlTransient - protected Locator locator; /** * Gets the value of the egColorTransform property. @@ -117,33 +109,33 @@ public class CTSRgbColor implements Loca * * <p> * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTAngle }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@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 CTComplementTransform }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@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 CTComplementTransform }{@code >} - * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@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 CTAngle }{@code >} * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >} + * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >} - * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * * @@ -184,19 +176,11 @@ public class CTSRgbColor implements Loca * */ public void setVal(byte[] value) { - this.val = value; + this.val = ((byte[]) value); } public boolean isSetVal() { 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/CTScRgbColor.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTScRgbColor.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTScRgbColor.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTScRgbColor.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; /** @@ -58,49 +54,45 @@ import org.xml.sax.Locator; @XmlType(name = "CT_ScRgbColor", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, propOrder = { "egColorTransform" }) -public class CTScRgbColor implements Locatable -{ +public class CTScRgbColor { @XmlElementRefs({ - @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 = "blue", 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 = "inv", 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 = "invGamma", 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 = "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 = "greenMod", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), - @XmlElementRef(name = "shade", namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, type = JAXBElement.class, required = false), - @XmlElementRef(name = "lum", 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 = "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 = "gamma", 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 = "alpha", 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 = "red", 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 = "redOff", 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 = "redMod", 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 = "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), + @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 = "red", 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 = "lumMod", 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 = "alpha", 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 = "shade", 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 = "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 = "blueMod", 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 = "tint", 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 = "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 = "alphaMod", 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 = "green", 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 = "satMod", 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 = "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) }) protected List<JAXBElement<?>> egColorTransform; - @XmlAttribute(name = "r", required = true) + @XmlAttribute(required = true) protected int r; - @XmlAttribute(name = "g", required = true) + @XmlAttribute(required = true) protected int g; - @XmlAttribute(name = "b", required = true) + @XmlAttribute(required = true) protected int b; - @XmlLocation - @XmlTransient - protected Locator locator; /** * Gets the value of the egColorTransform property. @@ -121,33 +113,33 @@ public class CTScRgbColor implements Loc * <p> * Objects of the following type(s) are allowed in the list * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTAngle }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >} - * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >} - * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@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 CTGammaTransform }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTInverseGammaTransform }{@code >} + * {@link JAXBElement }{@code <}{@link CTAngle }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTGammaTransform }{@code >} - * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >} * {@link JAXBElement }{@code <}{@link CTPositiveFixedPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTInverseTransform }{@code >} + * {@link JAXBElement }{@code <}{@link CTPositiveFixedAngle }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTGrayscaleTransform }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTComplementTransform }{@code >} * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} + * {@link JAXBElement }{@code <}{@link CTFixedPercentage }{@code >} * {@link JAXBElement }{@code <}{@link CTPositivePercentage }{@code >} - * {@link JAXBElement }{@code <}{@link CTPercentage }{@code >} * * */ @@ -226,12 +218,4 @@ public class CTScRgbColor implements Loc 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/CTScale2D.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTScale2D.java?rev=1689777&r1=1689776&r2=1689777&view=diff ============================================================================== --- poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTScale2D.java (original) +++ poi/branches/common_sl/src/scratchpad/src/org/apache/poi/sl/draw/binding/CTScale2D.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.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; /** @@ -52,17 +48,12 @@ import org.xml.sax.Locator; "sx", "sy" }) -public class CTScale2D - implements Locatable -{ +public class CTScale2D { @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, required = true) protected CTRatio sx; @XmlElement(namespace = "http://schemas.openxmlformats.org/drawingml/2006/main";, required = true) protected CTRatio sy; - @XmlLocation - @XmlTransient - protected Locator locator; /** * Gets the value of the sx property. @@ -120,12 +111,4 @@ public class CTScale2D return (this.sy!= 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]
