You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2019/11/21 23:21:16 UTC

svn commit: r1870125 - in /xmlbeans/trunk: src/tools/org/apache/xmlbeans/impl/xsd2inst/ src/typeimpl/org/apache/xmlbeans/impl/regex/ src/typeimpl/org/apache/xmlbeans/impl/validator/ src/xmlcomp/org/apache/xmlbeans/impl/tool/ src/xmlconfig/org/apache/xm...

Author: fanningpj
Date: Thu Nov 21 23:21:15 2019
New Revision: 1870125

URL: http://svn.apache.org/viewvc?rev=1870125&view=rev
Log:
replace some StringBuffers

Modified:
    xmlbeans/trunk/src/tools/org/apache/xmlbeans/impl/xsd2inst/SampleXmlUtil.java
    xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/regex/Token.java
    xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/validator/ValidatingXMLInputStream.java
    xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/XsbDumper.java
    xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java
    xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDurationBuilder.java
    xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlSimpleList.java
    xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/performance/xerces/POTopDownXercesSax.java
    xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/tools/PerfResultUtil.java
    xmlbeans/trunk/test/src/misc/detailed/JiraRegression1_50Test.java

Modified: xmlbeans/trunk/src/tools/org/apache/xmlbeans/impl/xsd2inst/SampleXmlUtil.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/tools/org/apache/xmlbeans/impl/xsd2inst/SampleXmlUtil.java?rev=1870125&r1=1870124&r2=1870125&view=diff
==============================================================================
--- xmlbeans/trunk/src/tools/org/apache/xmlbeans/impl/xsd2inst/SampleXmlUtil.java (original)
+++ xmlbeans/trunk/src/tools/org/apache/xmlbeans/impl/xsd2inst/SampleXmlUtil.java Thu Nov 21 23:21:15 2019
@@ -360,7 +360,7 @@ public class SampleXmlUtil
             return "";
             
         int i = pick(a.length);
-        StringBuffer sb = new StringBuffer(a[i]);
+        StringBuilder sb = new StringBuilder(a[i]);
         while (count-- > 0)
         {
             i += 1;
@@ -477,7 +477,7 @@ public class SampleXmlUtil
         {
             totalDigits = xmlD.getBigDecimalValue().intValue();
 
-            StringBuffer sb = new StringBuffer(totalDigits);
+            StringBuilder sb = new StringBuilder(totalDigits);
             for (int i = 0; i < totalDigits; i++)
                 sb.append('9');
             BigDecimal digitsLimit = new BigDecimal(sb.toString());
@@ -1157,7 +1157,7 @@ public class SampleXmlUtil
 
     private String printParticleType(int particleType)
     {
-        StringBuffer returnParticleType = new StringBuffer();
+        StringBuilder returnParticleType = new StringBuilder();
         returnParticleType.append("Schema Particle Type: ");
 
         switch (particleType)

Modified: xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/regex/Token.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/regex/Token.java?rev=1870125&r1=1870124&r2=1870125&view=diff
==============================================================================
--- xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/regex/Token.java (original)
+++ xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/regex/Token.java Thu Nov 21 23:21:15 2019
@@ -828,7 +828,7 @@ class Token implements java.io.Serializa
                 //REVISIT: do we really need to support block names as in Unicode 3.1
                 //         or we can just create all the names in IsBLOCKNAME format (XML Schema REC)?
                 //
-                StringBuffer buffer = new StringBuffer(50);
+                StringBuilder buffer = new StringBuilder(50);
                 for (int i = 0;  i < Token.blockNames.length;  i ++) {
                     Token r1 = Token.createRange();
                     int location;
@@ -1441,10 +1441,10 @@ class Token implements java.io.Serializa
             
             //System.err.println("Merge '"+previous+"' and '"+tok+"'.");
 
-            StringBuffer buffer;
+            StringBuilder buffer;
             int nextMaxLength = (tok.type == CHAR ? 2 : tok.getString().length());
             if (previous.type == CHAR) {        // Replace previous token by STRING
-                buffer = new StringBuffer(2 + nextMaxLength);
+                buffer = new StringBuilder(2 + nextMaxLength);
                 int ch = previous.getChar();
                 if (ch >= 0x10000)
                     buffer.append(REUtil.decomposeToSurrogates(ch));
@@ -1453,7 +1453,7 @@ class Token implements java.io.Serializa
                 previous = Token.createString(null);
                 this.children.setElementAt(previous, size-1);
             } else {                            // STRING
-                buffer = new StringBuffer(previous.getString().length() + nextMaxLength);
+                buffer = new StringBuilder(previous.getString().length() + nextMaxLength);
                 buffer.append(previous.getString());
             }
 

Modified: xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/validator/ValidatingXMLInputStream.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/validator/ValidatingXMLInputStream.java?rev=1870125&r1=1870124&r2=1870125&view=diff
==============================================================================
--- xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/validator/ValidatingXMLInputStream.java (original)
+++ xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/validator/ValidatingXMLInputStream.java Thu Nov 21 23:21:15 2019
@@ -378,7 +378,7 @@ public final class ValidatingXMLInputStr
 
     private XMLInputStream _source;
     private Validator      _validator;
-    private StringBuffer   _text = new StringBuffer();
+    private StringBuilder   _text = new StringBuilder();
     private boolean        _finished;
     private String         _xsiType;
     private String         _xsiNil;

Modified: xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/XsbDumper.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/XsbDumper.java?rev=1870125&r1=1870124&r2=1870125&view=diff
==============================================================================
--- xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/XsbDumper.java (original)
+++ xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/XsbDumper.java Thu Nov 21 23:21:15 2019
@@ -192,7 +192,7 @@ public class XsbDumper
 
     static String particleflagsString(int flags)
     {
-        StringBuffer result = new StringBuffer();
+        StringBuilder result = new StringBuilder();
         if ((flags & FLAG_PART_SKIPPABLE) != 0) result.append("FLAG_PART_SKIPPABLE | ");
         if ((flags & FLAG_PART_FIXED) != 0) result.append("FLAG_PART_FIXED | ");
         if ((flags & FLAG_PART_NILLABLE) != 0) result.append("FLAG_PART_NILLABLE | ");
@@ -213,7 +213,7 @@ public class XsbDumper
 
     static String propertyflagsString(int flags)
     {
-        StringBuffer result = new StringBuffer();
+        StringBuilder result = new StringBuilder();
         if ((flags & FLAG_PROP_ISATTR) != 0) result.append("FLAG_PROP_ISATTR | ");
         if ((flags & FLAG_PROP_JAVASINGLETON) != 0) result.append("FLAG_PROP_JAVASINGLETON | ");
         if ((flags & FLAG_PROP_JAVAOPTIONAL) != 0) result.append("FLAG_PROP_JAVAOPTIONAL | ");
@@ -264,7 +264,7 @@ public class XsbDumper
 
     static String typeflagsString(int flags)
     {
-        StringBuffer result = new StringBuffer();
+        StringBuilder result = new StringBuilder();
         if ((flags & FLAG_SIMPLE_TYPE) != 0) result.append("FLAG_SIMPLE_TYPE | ");
         if ((flags & FLAG_DOCUMENT_TYPE) != 0) result.append("FLAG_DOCUMENT_TYPE | ");
         if ((flags & FLAG_ATTRIBUTE_TYPE) != 0) result.append("FLAG_ATTRIBUTE_TYPE | ");

Modified: xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java?rev=1870125&r1=1870124&r2=1870125&view=diff
==============================================================================
--- xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java (original)
+++ xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java Thu Nov 21 23:21:15 2019
@@ -207,7 +207,7 @@ public class InterfaceExtensionImpl impl
 
     private static String listTypes(JClass[] types)
     {
-        StringBuffer result = new StringBuffer();
+        StringBuilder result = new StringBuilder();
         for (int i = 0; i < types.length; i++)
         {
             JClass type = types[i];
@@ -220,7 +220,7 @@ public class InterfaceExtensionImpl impl
 
     private static String listTypes(JParameter[] params)
     {
-        StringBuffer result = new StringBuffer();
+        StringBuilder result = new StringBuilder();
         for (int i = 0; i < params.length; i++)
         {
             JClass type = params[i].getType();
@@ -388,7 +388,7 @@ public class InterfaceExtensionImpl impl
             if (_signature!=null)
                 return _signature;
 
-            StringBuffer sb = new StringBuffer(60);
+            StringBuilder sb = new StringBuilder(60);
             sb.append(_name).append("(");
             for (int i = 0; i < _params.length; i++)
                 sb.append((i == 0 ? "" : " ,")).append(_params[i]);

Modified: xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDurationBuilder.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDurationBuilder.java?rev=1870125&r1=1870124&r2=1870125&view=diff
==============================================================================
--- xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDurationBuilder.java (original)
+++ xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDurationBuilder.java Thu Nov 21 23:21:15 2019
@@ -532,7 +532,7 @@ public class GDurationBuilder implements
         // Minutes:        (?:(\d+)M)?
         // Seconds:        (?:(\d+(?:\.\d*)?|(?:.\d+)S)?
 
-        StringBuffer message = new StringBuffer(30);
+        StringBuilder message = new StringBuilder(30);
 
         if (duration.getSign() < 0)
             message.append('-');
@@ -608,7 +608,7 @@ public class GDurationBuilder implements
 
         int point = intValStr.length() - scale - (isNegative ? 1 : 0);
 
-        StringBuffer sb = new StringBuffer(intValStr.length() + 2 + (point <= 0 ? (-point + 1) : 0));
+        StringBuilder sb = new StringBuilder(intValStr.length() + 2 + (point <= 0 ? (-point + 1) : 0));
         if (point <= 0)
         {
             // prepend zeros and a decimal point.

Modified: xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlSimpleList.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlSimpleList.java?rev=1870125&r1=1870124&r2=1870125&view=diff
==============================================================================
--- xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlSimpleList.java (original)
+++ xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlSimpleList.java Thu Nov 21 23:21:15 2019
@@ -137,7 +137,7 @@ public class XmlSimpleList implements Li
         String first = stringValue(underlying.get(0));
         if (size == 1)
             return first;
-        StringBuffer result = new StringBuffer(first);
+        StringBuilder result = new StringBuilder(first);
         for (int i = 1; i < size; i++)
         {
             result.append(' ');

Modified: xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/performance/xerces/POTopDownXercesSax.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/performance/xerces/POTopDownXercesSax.java?rev=1870125&r1=1870124&r2=1870125&view=diff
==============================================================================
--- xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/performance/xerces/POTopDownXercesSax.java (original)
+++ xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/performance/xerces/POTopDownXercesSax.java Thu Nov 21 23:21:15 2019
@@ -129,7 +129,7 @@ public class POTopDownXercesSax
   public static class MyHandler extends DefaultHandler
   {
     private int _hash = 0;
-    private StringBuffer _buff;
+    private StringBuilder _buff;
     private String _uri;
     private String _prefix;
     private final String SES = "<";
@@ -153,7 +153,7 @@ public class POTopDownXercesSax
     // sax event handlers
     public void startDocument() throws SAXException
     {
-      _buff = new StringBuffer(Constants.initialBuffSize);
+      _buff = new StringBuilder(Constants.initialBuffSize);
     }
 
     /*

Modified: xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/tools/PerfResultUtil.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/tools/PerfResultUtil.java?rev=1870125&r1=1870124&r2=1870125&view=diff
==============================================================================
--- xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/tools/PerfResultUtil.java (original)
+++ xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/tools/PerfResultUtil.java Thu Nov 21 23:21:15 2019
@@ -45,7 +45,7 @@ public class PerfResultUtil
 		final String HASH = "hash";
 		
 		FileReader reader = new FileReader(p_filename);
-		StringBuffer buff = new StringBuffer();
+		StringBuilder buff = new StringBuilder();
 		int c;
 		while( (c=reader.read()) != -1)
 		{

Modified: xmlbeans/trunk/test/src/misc/detailed/JiraRegression1_50Test.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/misc/detailed/JiraRegression1_50Test.java?rev=1870125&r1=1870124&r2=1870125&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/misc/detailed/JiraRegression1_50Test.java (original)
+++ xmlbeans/trunk/test/src/misc/detailed/JiraRegression1_50Test.java Thu Nov 21 23:21:15 2019
@@ -96,7 +96,7 @@ public class JiraRegression1_50Test exte
     public void test_jira_xmlbeans09() throws Exception {
         // Exec validate script from cmd line - Refer xmlbeans_09.xsd, xmlbeans_09.xml
 
-        StringBuffer sb = new StringBuffer(" ");
+        StringBuilder sb = new StringBuilder(" ");
         sb.append(System.getProperty("xbean.rootdir") + P + "bin" + P + "validate.cmd ");
         sb.append(scompTestFilesRoot + "xmlbeans_09.xsd_" + " " + scompTestFilesRoot + "xmlbeans_09.xml");
         Process validator_proc = null;
@@ -129,7 +129,7 @@ public class JiraRegression1_50Test exte
     @Test
     public void test_jira_xmlbeans11() throws Exception {
 
-        StringBuffer xsdAsString = new StringBuffer("<?xml version=\"1.0\" encoding=\"utf-8\" ?>");
+        StringBuilder xsdAsString = new StringBuilder("<?xml version=\"1.0\" encoding=\"utf-8\" ?>");
         xsdAsString.append(" <!-- W3C Schema generated by XML Spy v4.3 U (http://www.xmlspy.com)\n");
         xsdAsString.append("  --> \n");
         xsdAsString.append(" <xs:schema xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" elementFormDefault=\"qualified\">\n");
@@ -199,7 +199,7 @@ public class JiraRegression1_50Test exte
     @Test
     @Ignore("still happens with current xerces 2.11")
     public void test_jira_xmlbeans16() throws Exception {
-        StringBuffer sb = new StringBuffer(100);
+        StringBuilder sb = new StringBuilder(100);
         sb.append("<?xml version='1.0'?>\n");
         sb.append("<test noprefix='nonamespace' \n");
         sb.append("      ns:prefix='namespace' \n");



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org