svn commit: r656151 - in /incubator/tuscany/java/sca/modules/databinding/src: main/java/org/apache/tuscany/sca/databinding/impl/ main/java/org/apache/tuscany/sca/databinding/xml/ test/java/org/apache/tuscany/sca/databinding/xml/

[mc...@apache.org]

Author: mcombellack
Date: Wed May 14 01:39:15 2008
New Revision: 656151

URL: http://svn.apache.org/viewvc?rev=656151&view=rev
Log:
Corrected order of modifiers to be consistent with the recommendations from the Java Language Specification

Modified:
    incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java
    incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
    incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java
    incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java
    incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
    incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
    incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java?rev=656151&r1=656150&r2=656151&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java Wed May 14 01:39:15 2008
@@ -55,7 +55,7 @@
     /**
      * 
      */
-    private synchronized static void init() {
+    private static synchronized void init() {
         if (FACTORY == null) {
             FACTORY = DocumentBuilderFactory.newInstance();
             FACTORY.setNamespaceAware(true);

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java?rev=656151&r1=656150&r2=656151&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java Wed May 14 01:39:15 2008
@@ -44,7 +44,7 @@
  * @version $Rev$ $Date$
  */
 public class BeanXMLStreamReaderImpl extends XmlTreeStreamReaderImpl {
-    private final static Comparator<Accessor> COMPARATOR = new Comparator<Accessor>() {
+    private static final Comparator<Accessor> COMPARATOR = new Comparator<Accessor>() {
         public int compare(Accessor o1, Accessor o2) {
             return o1.getName().compareTo(o2.getName());
         }

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java?rev=656151&r1=656150&r2=656151&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java Wed May 14 01:39:15 2008
@@ -31,10 +31,10 @@
  * @version $Rev$ $Date$
  */
 public class SimpleXmlNodeImpl implements XmlNode {
-    private final static String XSI_PREFIX = "xsi";
-    private final static String XSI_NS = "http://www.w3.org/2001/XMLSchema-instance";
-    private final static QName XSI_NIL = new QName(XSI_NS, "nil", XSI_PREFIX);
-    private final static Map<String, String> NS_MAP = new HashMap<String, String>();
+    private static final String XSI_PREFIX = "xsi";
+    private static final String XSI_NS = "http://www.w3.org/2001/XMLSchema-instance";
+    private static final QName XSI_NIL = new QName(XSI_NS, "nil", XSI_PREFIX);
+    private static final Map<String, String> NS_MAP = new HashMap<String, String>();
     static {
         NS_MAP.put(XSI_PREFIX, XSI_NS);
     }

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java?rev=656151&r1=656150&r2=656151&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java Wed May 14 01:39:15 2008
@@ -32,8 +32,8 @@
  * @version $Rev$ $Date$
  */
 public class XmlNodeIterator implements Iterator<XmlNode> {
-    public final static int START = 0;
-    public final static int END = 1;
+    public static final int START = 0;
+    public static final int END = 1;
 
     protected FastStack<ElementHolder> stack;
     protected int state;

Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java?rev=656151&r1=656150&r2=656151&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java Wed May 14 01:39:15 2008
@@ -34,7 +34,7 @@
  * @version $Rev$ $Date$
  */
 public class BeanXMLStreamReaderTestCase extends TestCase {
-    private final static String XML_RESULT =
+    private static final String XML_RESULT =
         "<?xml version='1.0' encoding='UTF-8'?>" + "<MyBean xmlns=\"http://xml.databinding.sca.tuscany.apache.org/\">"
             + "<arr>1</arr><arr>2</arr><arr>3</arr><bean><name>Name</name></bean><i>1</i>"
             + "<list>Item1</list><list>Item2</list>"
@@ -44,7 +44,7 @@
             + "<str>ABC</str></MyBean>";
 
     // The map entries can come in a different order
-    private final static String XML_RESULT1 =
+    private static final String XML_RESULT1 =
         "<?xml version='1.0' encoding='UTF-8'?>" + "<MyBean xmlns=\"http://xml.databinding.sca.tuscany.apache.org/\">"
             + "<arr>1</arr><arr>2</arr><arr>3</arr><bean><name>Name</name></bean><i>1</i>"
             + "<list>Item1</list><list>Item2</list>"

Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java?rev=656151&r1=656150&r2=656151&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java Wed May 14 01:39:15 2008
@@ -30,7 +30,7 @@
  * @version $Rev$ $Date$
  */
 public class JavaBean2XMLStreamReaderTestCase extends TestCase {
-    private final static String XML_RESULT =
+    private static final String XML_RESULT =
         "<?xml version='1.0' encoding='UTF-8'?>" 
             + "<MyBean xmlns=\"http://xml.databinding.sca.tuscany.apache.org/\">"
             + "<arr>1</arr><arr>2</arr><arr>3</arr><bean><name>Name</name></bean><i>1</i><str>ABC</str>"

Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java?rev=656151&r1=656150&r2=656151&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java Wed May 14 01:39:15 2008
@@ -71,7 +71,7 @@
             + "  </items>"
             + "</ipo:purchaseOrder>";
 
-    private final static String XML_RESULT =
+    private static final String XML_RESULT =
         "<?xml version='1.0' encoding='UTF-8'?>" + "<p1:e1 xmlns:p1=\"http://ns\">"
             + "<p2:e11 xmlns:p2=\"http://ns1\">MyText</p2:e11>"
             + "<p1:e12><p1:e121 /></p1:e12>"