Context Navigation

← Previous Changeset
Next Changeset →

Changeset 1129

Timestamp:

06/14/10 16:13:34 (2 years ago)

Author:

jharrop

Message:

Fix instances of "Two classes have the same XML type name -- Use .. @XmlType? namespace to assign different names to them."

Location:

trunk/docx4j/src/main/java/org/docx4j

Files:

: 22 edited

dml/chart/CTLvl.java (modified) (1 diff)
dml/chart/CTMarker.java (modified) (1 diff)
dml/chart/CTNumFmt.java (modified) (1 diff)
dml/chart/CTShape.java (modified) (1 diff)
dml/chart/CTStyle.java (modified) (1 diff)
dml/chartDrawing/CTDrawing.java (modified) (1 diff)
dml/chartDrawing/CTMarker.java (modified) (1 diff)
dml/chartDrawing/CTPictureNonVisual.java (modified) (1 diff)
dml/chartDrawing/CTShape.java (modified) (1 diff)
dml/compatibility/CTCompat.java (modified) (1 diff)
dml/diagram/CTRules.java (modified) (1 diff)
dml/diagram/CTShape.java (modified) (1 diff)
dml/picture/CTPictureNonVisual.java (modified) (1 diff)
dml/picture/Pic.java (modified) (1 diff)
math/CTStyle.java (modified) (1 diff)
vml/CTShape.java (modified) (1 diff)
vml/officedrawing/CTRules.java (modified) (1 diff)
wml/CTCompat.java (modified) (1 diff)
wml/Drawing.java (modified) (1 diff)
wml/Lvl.java (modified) (1 diff)
wml/NumFmt.java (modified) (1 diff)
wml/Pict.java (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/docx4j/src/main/java/org/docx4j/dml/chart/CTLvl.java

r1041	r1129
49	49	*/
50	50	@XmlAccessorType(XmlAccessType.FIELD)
51		@XmlType(name = "CT_Lvl", propOrder = {
	51	@XmlType(namespace="http://schemas.openxmlformats.org/drawingml/2006/chart", name = "CT_Lvl", propOrder = {
52	52	"pt"
53	53	})

trunk/docx4j/src/main/java/org/docx4j/dml/chart/CTMarker.java

r1041	r1129
51	51	*/
52	52	@XmlAccessorType(XmlAccessType.FIELD)
53		@XmlType(name = "CT_Marker", propOrder = {
	53	@XmlType(namespace="http://schemas.openxmlformats.org/drawingml/2006/chart", name = "CT_Marker", propOrder = {
54	54	"symbol",
55	55	"size",

trunk/docx4j/src/main/java/org/docx4j/dml/chart/CTNumFmt.java

r1041	r1129
47	47	*/
48	48	@XmlAccessorType(XmlAccessType.FIELD)
49		@XmlType(name = "CT_NumFmt")
	49	@XmlType(namespace="http://schemas.openxmlformats.org/drawingml/2006/chart", name = "CT_NumFmt")
50	50	public class CTNumFmt {
51	51

trunk/docx4j/src/main/java/org/docx4j/dml/chart/CTShape.java

r1041	r1129
46	46	*/
47	47	@XmlAccessorType(XmlAccessType.FIELD)
48		@XmlType(name = "CT_Shape")
	48	@XmlType(namespace="http://schemas.openxmlformats.org/drawingml/2006/chart", name = "CT_Shape")
49	49	public class CTShape {
50	50

trunk/docx4j/src/main/java/org/docx4j/dml/chart/CTStyle.java

r1041	r1129
46	46	*/
47	47	@XmlAccessorType(XmlAccessType.FIELD)
48		@XmlType(name = "CT_Style")
	48	@XmlType(namespace="http://schemas.openxmlformats.org/drawingml/2006/chart", name = "CT_Style")
49	49	public class CTStyle {
50	50

trunk/docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTDrawing.java

r1041	r1129
31	31	*/
32	32	@XmlAccessorType(XmlAccessType.FIELD)
33		@XmlType(name = "CT_Drawing", propOrder = {
	33	@XmlType(namespace="http://schemas.openxmlformats.org/drawingml/2006/chartDrawing", name = "CT_Drawing", propOrder = {
34	34	"egAnchor"
35	35	})

trunk/docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTMarker.java

r1041	r1129
28	28	*/
29	29	@XmlAccessorType(XmlAccessType.FIELD)
30		@XmlType(name = "CT_Marker", propOrder = {
	30	@XmlType(namespace="http://schemas.openxmlformats.org/drawingml/2006/chartDrawing", name = "CT_Marker", propOrder = {
31	31	"x",
32	32	"y"

trunk/docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTPictureNonVisual.java

r1041	r1129
31	31	*/
32	32	@XmlAccessorType(XmlAccessType.FIELD)
33		@XmlType(name = "CT_PictureNonVisual", propOrder = {
	33	@XmlType(namespace="http://schemas.openxmlformats.org/drawingml/2006/chartDrawing", name = "CT_PictureNonVisual", propOrder = {
34	34	"cNvPr",
35	35	"cNvPicPr"

trunk/docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTShape.java

r1041	r1129
39	39	*/
40	40	@XmlAccessorType(XmlAccessType.FIELD)
41		@XmlType(name = "CT_Shape", propOrder = {
	41	@XmlType(namespace="http://schemas.openxmlformats.org/drawingml/2006/chartDrawing", name = "CT_Shape", propOrder = {
42	42	"nvSpPr",
43	43	"spPr",

trunk/docx4j/src/main/java/org/docx4j/dml/compatibility/CTCompat.java

r1041	r1129
48	48	*/
49	49	@XmlAccessorType(XmlAccessType.FIELD)
50		@XmlType(name = "CT_Compat")
	50	@XmlType(namespace = "http://schemas.openxmlformats.org/drawingml/2006/compatibility", name = "CT_Compat")
51	51	public class CTCompat {
52	52

trunk/docx4j/src/main/java/org/docx4j/dml/diagram/CTRules.java

r1041	r1129
49	49	*/
50	50	@XmlAccessorType(XmlAccessType.FIELD)
51		@XmlType(name = "CT_Rules", propOrder = {
	51	@XmlType(namespace="http://schemas.openxmlformats.org/drawingml/2006/diagram", name = "CT_Rules", propOrder = {
52	52	"rule"
53	53	})

trunk/docx4j/src/main/java/org/docx4j/dml/diagram/CTShape.java

r1041	r1129
57	57	*/
58	58	@XmlAccessorType(XmlAccessType.FIELD)
59		@XmlType(name = "CT_Shape", propOrder = {
	59	@XmlType(namespace="http://schemas.openxmlformats.org/drawingml/2006/diagram", name = "CT_Shape", propOrder = {
60	60	"adjLst",
61	61	"extLst"

trunk/docx4j/src/main/java/org/docx4j/dml/picture/CTPictureNonVisual.java

r1041	r1129
51	51	*/
52	52	@XmlAccessorType(XmlAccessType.FIELD)
53		@XmlType(name = "CT_PictureNonVisual", propOrder = {
	53	@XmlType(namespace = "http://schemas.openxmlformats.org/drawingml/2006/picture", name = "CT_PictureNonVisual", propOrder = {
54	54	"cNvPr",
55	55	"cNvPicPr"

trunk/docx4j/src/main/java/org/docx4j/dml/picture/Pic.java

r1041	r1129
52	52	*/
53	53	@XmlAccessorType(XmlAccessType.FIELD)
54		@XmlType(name = "CT_Picture", propOrder = {
	54	@XmlType(namespace = "http://schemas.openxmlformats.org/drawingml/2006/picture", name = "CT_Picture", propOrder = {
55	55	"nvPicPr",
56	56	"blipFill",

trunk/docx4j/src/main/java/org/docx4j/math/CTStyle.java

r888	r1129
49	49	*/
50	50	@XmlAccessorType(XmlAccessType.FIELD)
51		@XmlType(name = "CT_Style")
	51	@XmlType(namespace = "http://schemas.openxmlformats.org/officeDocument/2006/math", name = "CT_Style")
52	52	public class CTStyle
53	53	implements Child

trunk/docx4j/src/main/java/org/docx4j/vml/CTShape.java

r885	r1129
123	123	*/
124	124	@XmlAccessorType(XmlAccessType.FIELD)
125		@XmlType(name = "CT_Shape", propOrder = {
	125	@XmlType(namespace = "urn:schemas-microsoft-com:vml", name = "CT_Shape", propOrder = {
126	126	"any"
127	127	})

trunk/docx4j/src/main/java/org/docx4j/vml/officedrawing/CTRules.java

r885	r1129
55	55	*/
56	56	@XmlAccessorType(XmlAccessType.FIELD)
57		@XmlType(name = "CT_Rules", propOrder = {
	57	@XmlType(namespace = "urn:schemas-microsoft-com:office:office", name = "CT_Rules", propOrder = {
58	58	"r"
59	59	})

trunk/docx4j/src/main/java/org/docx4j/wml/CTCompat.java

r359	r1129
114	114	*/
115	115	@XmlAccessorType(XmlAccessType.FIELD)
116		@XmlType(name = "CT_Compat", propOrder = {
	116	@XmlType(namespace="http://schemas.openxmlformats.org/wordprocessingml/2006/main", name = "CT_Compat", propOrder = {
117	117	"useSingleBorderforContiguousCells",
118	118	"wpJustification",

trunk/docx4j/src/main/java/org/docx4j/wml/Drawing.java

r1044	r1129
58	58	*/
59	59	@XmlAccessorType(XmlAccessType.FIELD)
60		@XmlType(name = "CT_Drawing", propOrder = {
	60	@XmlType(namespace="http://schemas.openxmlformats.org/wordprocessingml/2006/main", name = "CT_Drawing", propOrder = {
61	61	"anchorOrInline"
62	62	})

trunk/docx4j/src/main/java/org/docx4j/wml/Lvl.java

r359	r1129
148	148	*/
149	149	@XmlAccessorType(XmlAccessType.FIELD)
150		@XmlType(name = "CT_Lvl", propOrder = {
	150	@XmlType(namespace="http://schemas.openxmlformats.org/wordprocessingml/2006/main", name = "CT_Lvl", propOrder = {
151	151	"start",
152	152	"numFmt",

trunk/docx4j/src/main/java/org/docx4j/wml/NumFmt.java

r568	r1129
49	49	*/
50	50	@XmlAccessorType(XmlAccessType.FIELD)
51		@XmlType(name = "CT_NumFmt")
	51	@XmlType(namespace="http://schemas.openxmlformats.org/wordprocessingml/2006/main", name = "CT_NumFmt")
52	52	public class NumFmt
53	53	implements Child

trunk/docx4j/src/main/java/org/docx4j/wml/Pict.java

r546	r1129
51	51	*/
52	52	@XmlAccessorType(XmlAccessType.FIELD)
53		@XmlType(name = "CT_Picture", propOrder = {
	53	@XmlType(namespace="http://schemas.openxmlformats.org/wordprocessingml/2006/main", name = "CT_Picture", propOrder = {
54	54	"movie",
55	55	"control"

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 1129

Legend:

Download in other formats: