Author: bimargulies
Date: Wed Jan 7 14:00:06 2009
New Revision: 732525
URL: http://svn.apache.org/viewvc?rev=732525&view=rev
Log:
Move the attribute to the ref= discipline.
Modified:
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAttribute.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AttributeRefTest.java
Modified:
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java?rev=732525&r1=732524&r2=732525&view=diff
==============================================================================
---
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
(original)
+++
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
Wed Jan 7 14:00:06 2009
@@ -1191,8 +1191,7 @@
}
if (attrEl.hasAttribute("ref")) {
String name = attrEl.getAttribute("ref");
- attr.setRefName(getRefQName(name, attrEl));
- attr.setName(name);
+ attr.getRef().setTargetQName(getRefQName(name, attrEl));
}
Element simpleTypeEl = XDOMUtil.getFirstChildElementNS(attrEl,
XmlSchema.SCHEMA_NS, "simpleType");
Modified:
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAttribute.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAttribute.java?rev=732525&r1=732524&r2=732525&view=diff
==============================================================================
---
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAttribute.java
(original)
+++
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAttribute.java
Wed Jan 7 14:00:06 2009
@@ -23,6 +23,7 @@
import org.apache.ws.commons.schema.utils.XmlSchemaNamedWithForm;
import org.apache.ws.commons.schema.utils.XmlSchemaNamedWithFormImpl;
+import org.apache.ws.commons.schema.utils.XmlSchemaRef;
/**
* Class for attribute types. Represents the World Wide Web Consortium (W3C)
attribute element.
@@ -33,9 +34,9 @@
private String fixedValue;
private XmlSchemaSimpleType schemaType;
private QName schemaTypeName;
- private QName refName;
private XmlSchemaUse use;
- private XmlSchemaNamedWithForm namedDelegate;
+ private XmlSchemaNamedWithFormImpl namedDelegate;
+ private XmlSchemaRef<XmlSchemaAttribute> ref;
/**
* Create a new attribute.
@@ -44,6 +45,9 @@
*/
public XmlSchemaAttribute(XmlSchema schema, boolean topLevel) {
namedDelegate = new XmlSchemaNamedWithFormImpl(schema, topLevel,
false);
+ ref = new XmlSchemaRef<XmlSchemaAttribute>(schema,
XmlSchemaAttribute.class);
+ namedDelegate.setRefObject(ref);
+ ref.setNamedObject(namedDelegate);
use = XmlSchemaUse.NONE;
}
@@ -63,12 +67,8 @@
this.fixedValue = fixedValue;
}
- public QName getRefName() {
- return refName;
- }
-
- public void setRefName(QName refName) {
- this.refName = refName;
+ public XmlSchemaRef<XmlSchemaAttribute> getRef() {
+ return ref;
}
public XmlSchemaSimpleType getSchemaType() {
@@ -95,25 +95,6 @@
this.use = use;
}
- public String toString(String aprefix, int tab) {
- String prefix = aprefix;
- String xml = new String();
-
- if (!"".equals(prefix) && prefix.indexOf(":") == -1) {
- prefix += ":";
- }
-
- for (int i = 0; i < tab; i++) {
- xml += "\t";
- }
-
- xml += "<" + prefix + "attribute name=\""
- + getName() + "\" type=\"" + schemaTypeName + "\"/>\n";
-
- return xml;
- }
-
-
public String getName() {
return namedDelegate.getName();
}
Modified:
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java?rev=732525&r1=732524&r2=732525&view=diff
==============================================================================
---
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java
(original)
+++
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java
Wed Jan 7 14:00:06 2009
@@ -365,8 +365,8 @@
Element attribute = createNewElement(doc, "attribute",
schema.schemaNamespacePrefix,
XmlSchema.SCHEMA_NS);
- if (attributeObj.getRefName() != null) {
- String refName = resolveQName(attributeObj.getRefName(), schema);
+ if (attributeObj.getRef().getTargetQName() != null) {
+ String refName =
resolveQName(attributeObj.getRef().getTargetQName(), schema);
attribute.setAttribute("ref", refName);
} else if (!attributeObj.isAnonymous()) {
attribute.setAttribute("name", attributeObj.getName());
Modified:
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AttributeRefTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AttributeRefTest.java?rev=732525&r1=732524&r2=732525&view=diff
==============================================================================
---
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AttributeRefTest.java
(original)
+++
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AttributeRefTest.java
Wed Jan 7 14:00:06 2009
@@ -63,7 +63,7 @@
assertNotNull(typeByName);
XmlSchemaAttribute item =
(XmlSchemaAttribute)typeByName.getAttributes().getItem(0);
- QName qName = item.getRefName();
+ QName qName = item.getRef().getTargetQName();
assertNotNull(qName);
String namspace = qName.getNamespaceURI();
