svn commit: r1845335 - in /webservices/xmlschema/trunk: xmlschema-core/src/main/java/org/apache/ws/commons/schema/ xmlschema-core/src/main/java/org/apache/ws/commons/schema/utils/ xmlschema-walker/src/main/java/org/apache/ws/commons/schema/docpath/

[co...@apache.org]

Author: coheigea
Date: Wed Oct 31 14:35:58 2018
New Revision: 1845335

URL: http://svn.apache.org/viewvc?rev=1845335&view=rev
Log:
Some minor improvements

Modified:
    webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
    webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java
    webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/XmlSchemaDerivationMethod.java
    webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/utils/DOMUtil.java
    webservices/xmlschema/trunk/xmlschema-walker/src/main/java/org/apache/ws/commons/schema/docpath/XmlSchemaElementValidator.java

Modified: webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java?rev=1845335&r1=1845334&r2=1845335&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java (original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java Wed Oct 31 14:35:58 2018
@@ -986,7 +986,7 @@ public class SchemaBuilder {
         }
 
         NamedNodeMap attrNodes = attrEl.getAttributes();
-        Vector<Attr> attrs = new Vector<Attr>();
+        List<Attr> attrs = new ArrayList<Attr>();
         NodeNamespaceContext ctx = null;
         for (int i = 0; i < attrNodes.getLength(); i++) {
             Attr att = (Attr)attrNodes.item(i);

Modified: webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java?rev=1845335&r1=1845334&r2=1845335&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java (original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java Wed Oct 31 14:35:58 2018
@@ -54,7 +54,6 @@ import org.apache.ws.commons.schema.exte
 import org.apache.ws.commons.schema.resolver.CollectionURIResolver;
 import org.apache.ws.commons.schema.resolver.DefaultURIResolver;
 import org.apache.ws.commons.schema.resolver.URIResolver;
-import org.apache.ws.commons.schema.utils.DOMUtil;
 import org.apache.ws.commons.schema.utils.NamespacePrefixList;
 import org.apache.ws.commons.schema.utils.TargetNamespaceValidator;
 

Modified: webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/XmlSchemaDerivationMethod.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/XmlSchemaDerivationMethod.java?rev=1845335&r1=1845334&r2=1845335&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/XmlSchemaDerivationMethod.java (original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/XmlSchemaDerivationMethod.java Wed Oct 31 14:35:58 2018
@@ -97,7 +97,7 @@ public class XmlSchemaDerivationMethod {
     }
     
     public boolean notAll() {
-        return empty | extension | list | restriction | substitution | union;
+        return empty || extension || list || restriction || substitution || union;
     }
     
 

Modified: webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/utils/DOMUtil.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/utils/DOMUtil.java?rev=1845335&r1=1845334&r2=1845335&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/utils/DOMUtil.java (original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/utils/DOMUtil.java Wed Oct 31 14:35:58 2018
@@ -459,7 +459,7 @@ public class DOMUtil {
         }
 
         // concatenate children text
-        StringBuffer str = new StringBuffer();
+        StringBuilder str = new StringBuilder();
         Node child = node.getFirstChild();
         while (child != null) {
             short type = child.getNodeType();

Modified: webservices/xmlschema/trunk/xmlschema-walker/src/main/java/org/apache/ws/commons/schema/docpath/XmlSchemaElementValidator.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-walker/src/main/java/org/apache/ws/commons/schema/docpath/XmlSchemaElementValidator.java?rev=1845335&r1=1845334&r2=1845335&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-walker/src/main/java/org/apache/ws/commons/schema/docpath/XmlSchemaElementValidator.java (original)
+++ webservices/xmlschema/trunk/xmlschema-walker/src/main/java/org/apache/ws/commons/schema/docpath/XmlSchemaElementValidator.java Wed Oct 31 14:35:58 2018
@@ -438,7 +438,7 @@ final class XmlSchemaElementValidator {
 
         case FLOAT:
             try {
-                rangeChecks(name, new BigDecimal(DatatypeConverter.parseFloat(value)), facets);
+                rangeChecks(name, BigDecimal.valueOf(DatatypeConverter.parseFloat(value)), facets);
             } catch (NumberFormatException iae) {
                 throw new ValidationException(name + " value of \"" + value + "\" is not a valid float.", iae);
             }
@@ -457,7 +457,7 @@ final class XmlSchemaElementValidator {
 
         case DOUBLE:
             try {
-                rangeChecks(name, new BigDecimal(DatatypeConverter.parseDouble(value)), facets);
+                rangeChecks(name, BigDecimal.valueOf(DatatypeConverter.parseDouble(value)), facets);
             } catch (NumberFormatException iae) {
                 throw new ValidationException(name + " value of \"" + value + "\" is not a valid double.",
                                               iae);
@@ -561,10 +561,10 @@ final class XmlSchemaElementValidator {
             newValue = (BigDecimal)numericValue;
 
         } else if (numericValue instanceof Double) {
-            newValue = new BigDecimal(((Double)numericValue).doubleValue());
+            newValue = BigDecimal.valueOf(((Double)numericValue).doubleValue());
 
         } else if (numericValue instanceof Float) {
-            newValue = new BigDecimal(((Float)numericValue).floatValue());
+            newValue = BigDecimal.valueOf(((Float)numericValue).floatValue());
 
         } else if (numericValue instanceof BigInteger) {
             newValue = new BigDecimal((BigInteger)numericValue);