You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by sm...@apache.org on 2014/08/29 12:20:50 UTC

svn commit: r1621280 - in /pivot/trunk: core/src/org/apache/pivot/beans/BXMLSerializer.java tests/src/org/apache/pivot/tests/issues/pivot894/Pivot894.java wtk/src/org/apache/pivot/wtk/text/Span.java

Author: smartini
Date: Fri Aug 29 10:20:50 2014
New Revision: 1621280

URL: http://svn.apache.org/r1621280
Log:
PIVOT-957, Remove deprecated classes and methods

Removed:
    pivot/trunk/wtk/src/org/apache/pivot/wtk/text/Span.java
Modified:
    pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java
    pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot894/Pivot894.java

Modified: pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java?rev=1621280&r1=1621279&r2=1621280&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java Fri Aug 29 10:20:50 2014
@@ -139,7 +139,7 @@ public class BXMLSerializer implements S
             if (returnType == Vote.class) {
                 result = Vote.APPROVE;
             } else if (returnType == Boolean.TYPE) {
-                result = false;
+                result = Boolean.FALSE;
             }
 
             return result;
@@ -176,7 +176,7 @@ public class BXMLSerializer implements S
                 if (returnType == Vote.class) {
                     result = Vote.APPROVE;
                 } else if (returnType == Boolean.TYPE) {
-                    result = false;
+                    result = Boolean.FALSE;
                 }
             }
 
@@ -292,7 +292,7 @@ public class BXMLSerializer implements S
 
     public BXMLSerializer() {
         xmlInputFactory = XMLInputFactory.newInstance();
-        xmlInputFactory.setProperty("javax.xml.stream.isCoalescing", true);
+        xmlInputFactory.setProperty("javax.xml.stream.isCoalescing", Boolean.TRUE);
 
         scriptEngineManager = new javax.script.ScriptEngineManager();
         scriptEngineManager.setBindings(new Bindings() {
@@ -383,13 +383,6 @@ public class BXMLSerializer implements S
         });
     }
 
-    /** DO NOT USE. see https://issues.apache.org/jira/browse/PIVOT-742 */
-    @Deprecated
-    public BXMLSerializer(@SuppressWarnings("unused")
-    final ClassLoader classLoader) {
-        throw new UnsupportedOperationException("https://issues.apache.org/jira/browse/PIVOT-742");
-    }
-
     /**
      * Deserializes an object hierarchy from a BXML resource. <p> This is the
      * base version of the method. It does not set the "location" or "resources"

Modified: pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot894/Pivot894.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot894/Pivot894.java?rev=1621280&r1=1621279&r2=1621280&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot894/Pivot894.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot894/Pivot894.java Fri Aug 29 10:20:50 2014
@@ -97,15 +97,15 @@ public class Pivot894 extends Applicatio
                         @Override
                         public void run() {
                             Iterator<Component> iterator = cardPane.iterator();
-                            List<Component> deprecated = new ArrayList<>();
+                            List<Component> componentList = new ArrayList<>();
                             while (iterator.hasNext()) {
                                 Component card = iterator.next();
                                 if (!card.isShowing()) {
-                                    deprecated.add(card);
+                                    componentList.add(card);
                                 }
                             }
 
-                            for (Component card : deprecated) {
+                            for (Component card : componentList) {
                                 cardPane.remove(card);
                             }