You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by ch...@apache.org on 2006/09/16 20:26:57 UTC
svn commit: r446910 -
/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/
Author: chinthaka
Date: Sat Sep 16 11:26:56 2006
New Revision: 446910
URL: http://svn.apache.org/viewvc?view=rev&rev=446910
Log:
Removing redundant type casts
Fixing a probable bug as AtributeGroupRef handling was not correct in Schema Serializer
Modified:
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaEnumerationFacet.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaFractionDigitsFacet.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaLengthFacet.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMaxExclusiveFacet.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMaxInclusiveFacet.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMaxLengthFacet.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMinExclusiveFacet.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMinInclusiveFacet.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMinLengthFacet.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaPatternFacet.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaTotalDigitsFacet.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaWhiteSpaceFacet.java
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaEnumerationFacet.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaEnumerationFacet.java?view=diff&rev=446910&r1=446909&r2=446910
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaEnumerationFacet.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaEnumerationFacet.java Sat Sep 16 11:26:56 2006
@@ -32,14 +32,13 @@
public XmlSchemaEnumerationFacet(Object value, boolean fixed) {
super(value, fixed);
}
-
+
public String toString(String prefix, int tab) {
StringBuffer xml = new StringBuffer();
for (int i = 0; i < tab; i++) {
xml.append("\t");
}
- xml.append("<enumeration value=\""
- + (String)super.getValue() + "\" ");
+ xml.append("<enumeration value=\"").append(super.getValue()).append("\" ");
xml.append("fixed=\"" + super.isFixed() + "\"/>\n");
return xml.toString();
}
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaFractionDigitsFacet.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaFractionDigitsFacet.java?view=diff&rev=446910&r1=446909&r2=446910
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaFractionDigitsFacet.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaFractionDigitsFacet.java Sat Sep 16 11:26:56 2006
@@ -38,8 +38,7 @@
for (int i = 0; i < tab; i++) {
xml.append("\t");
}
- xml.append("<fractionDigits value=\""
- + (String)super.getValue() + "\" ");
+ xml.append("<fractionDigits value=\"").append(super.getValue()).append("\" ");
xml.append("fixed=\"" + super.isFixed() + "\"/>\n");
return xml.toString();
}
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaLengthFacet.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaLengthFacet.java?view=diff&rev=446910&r1=446909&r2=446910
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaLengthFacet.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaLengthFacet.java Sat Sep 16 11:26:56 2006
@@ -38,8 +38,7 @@
for (int i = 0; i < tab; i++) {
xml.append("\t");
}
- xml.append("<length value=\""
- + (String)super.getValue() + "\" ");
+ xml.append("<length value=\"").append(super.getValue()).append("\" ");
xml.append("fixed=\"" + super.isFixed() + "\"/>\n");
return xml.toString();
}
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMaxExclusiveFacet.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMaxExclusiveFacet.java?view=diff&rev=446910&r1=446909&r2=446910
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMaxExclusiveFacet.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMaxExclusiveFacet.java Sat Sep 16 11:26:56 2006
@@ -38,8 +38,7 @@
for (int i = 0; i < tab; i++) {
xml.append("\t");
}
- xml.append("<maxExclusive value=\""
- + (String)super.getValue() + "\" ");
+ xml.append("<maxExclusive value=\"").append(super.getValue()).append("\" ");
xml.append("fixed=\"" + super.isFixed() + "\"/>\n");
return xml.toString();
}
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMaxInclusiveFacet.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMaxInclusiveFacet.java?view=diff&rev=446910&r1=446909&r2=446910
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMaxInclusiveFacet.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMaxInclusiveFacet.java Sat Sep 16 11:26:56 2006
@@ -38,8 +38,7 @@
for (int i = 0; i < tab; i++) {
xml.append("\t");
}
- xml.append("<maxInclusive value=\""
- + (String)super.getValue() + "\" ");
+ xml.append("<maxInclusive value=\"").append(super.getValue()).append("\" ");
xml.append("fixed=\"" + super.isFixed() + "\"/>\n");
return xml.toString();
}
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMaxLengthFacet.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMaxLengthFacet.java?view=diff&rev=446910&r1=446909&r2=446910
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMaxLengthFacet.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMaxLengthFacet.java Sat Sep 16 11:26:56 2006
@@ -38,8 +38,7 @@
for (int i = 0; i < tab; i++) {
xml.append("\t");
}
- xml.append("<maxLength value=\""
- + (String)super.getValue() + "\" ");
+ xml.append("<maxLength value=\"").append(super.getValue()).append("\" ");
xml.append("fixed=\"" + super.isFixed() + "\"/>\n");
return xml.toString();
}
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMinExclusiveFacet.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMinExclusiveFacet.java?view=diff&rev=446910&r1=446909&r2=446910
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMinExclusiveFacet.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMinExclusiveFacet.java Sat Sep 16 11:26:56 2006
@@ -38,8 +38,7 @@
for (int i = 0; i < tab; i++) {
xml.append("\t");
}
- xml.append("<minExclusive value=\""
- + (String)super.getValue() + "\" ");
+ xml.append("<minExclusive value=\"").append((String) super.getValue()).append("\" ");
xml.append("fixed=\"" + super.isFixed() + "\"/>\n");
return xml.toString();
}
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMinInclusiveFacet.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMinInclusiveFacet.java?view=diff&rev=446910&r1=446909&r2=446910
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMinInclusiveFacet.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMinInclusiveFacet.java Sat Sep 16 11:26:56 2006
@@ -38,8 +38,7 @@
for (int i = 0; i < tab; i++) {
xml.append("\t");
}
- xml.append("<minInclusive value=\""
- + (String)super.getValue() + "\" ");
+ xml.append("<minInclusive value=\"").append(super.getValue()).append("\" ");
xml.append("fixed=\"" + super.isFixed() + "\"/>\n");
return xml.toString();
}
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMinLengthFacet.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMinLengthFacet.java?view=diff&rev=446910&r1=446909&r2=446910
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMinLengthFacet.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMinLengthFacet.java Sat Sep 16 11:26:56 2006
@@ -38,9 +38,8 @@
for (int i = 0; i < tab; i++) {
xml.append("\t");
}
- xml.append("<minLength value=\""
- + (String)super.getValue() + "\" ");
- xml.append("fixed=\"" + super.isFixed() + "\"/>\n");
+ xml.append("<minLength value=\"").append(super.getValue()).append("\" ");
+ xml.append("fixed=\"").append(super.isFixed()).append("\"/>\n");
return xml.toString();
}
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaPatternFacet.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaPatternFacet.java?view=diff&rev=446910&r1=446909&r2=446910
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaPatternFacet.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaPatternFacet.java Sat Sep 16 11:26:56 2006
@@ -38,9 +38,8 @@
for (int i = 0; i < tab; i++) {
xml.append("\t");
}
- xml.append("<pattern value=\""
- + (String)super.getValue() + "\" ");
- xml.append("fixed=\"" + super.isFixed() + "\"/>\n");
+ xml.append("<pattern value=\"").append(super.getValue()).append("\" ");
+ xml.append("fixed=\"").append(super.isFixed()).append("\"/>\n");
return xml.toString();
}
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?view=diff&rev=446910&r1=446909&r2=446910
==============================================================================
--- 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 Sat Sep 16 11:26:56 2006
@@ -2183,7 +2183,7 @@
Element attr = serializeAttribute(doc,
(XmlSchemaAttribute) obj, schema);
restriction.appendChild(attr);
- } else if (obj instanceof XmlSchemaAttribute) {
+ } else if (obj instanceof XmlSchemaAttributeGroupRef) {
Element attrGroup = serializeAttributeGroupRef(doc,
(XmlSchemaAttributeGroupRef) obj, schema);
restriction.appendChild(attrGroup);
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaTotalDigitsFacet.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaTotalDigitsFacet.java?view=diff&rev=446910&r1=446909&r2=446910
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaTotalDigitsFacet.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaTotalDigitsFacet.java Sat Sep 16 11:26:56 2006
@@ -38,9 +38,8 @@
for (int i = 0; i < tab; i++) {
xml.append("\t");
}
- xml.append("<totalDigits value=\""
- + (String)super.getValue() + "\" ");
- xml.append("fixed=\"" + super.isFixed() + "\"/>\n");
+ xml.append("<totalDigits value=\"").append(super.getValue()).append("\" ");
+ xml.append("fixed=\"").append(super.isFixed()).append("\"/>\n");
return xml.toString();
}
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaWhiteSpaceFacet.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaWhiteSpaceFacet.java?view=diff&rev=446910&r1=446909&r2=446910
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaWhiteSpaceFacet.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaWhiteSpaceFacet.java Sat Sep 16 11:26:56 2006
@@ -42,9 +42,8 @@
for (int i = 0; i < tab; i++) {
xml.append("\t");
}
- xml.append("<whiteSpace value=\""
- + (String)super.getValue() + "\" ");
- xml.append("fixed=\"" + super.isFixed() + "\"/>\n");
+ xml.append("<whiteSpace value=\"").append(super.getValue()).append("\" ");
+ xml.append("fixed=\"").append(super.isFixed()).append("\"/>\n");
return xml.toString();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: commons-dev-help@ws.apache.org