svn commit: r824372 - in /harmony/enhanced/classlib/trunk/modules/accessibility: make/findbugs-exclude-filter.xml src/main/java/javax/accessibility/AccessibleAction.java src/main/java/javax/accessibility/AccessibleRelation.java

[od...@apache.org]

Author: odeakin
Date: Mon Oct 12 15:07:11 2009
New Revision: 824372

URL: http://svn.apache.org/viewvc?rev=824372&view=rev
Log:
Revert commit at r824353 - these String constructor calls are required, see HARMONY-6008. Add comment to indicate this to the code and exclude the findbugs failures.

Modified:
    harmony/enhanced/classlib/trunk/modules/accessibility/make/findbugs-exclude-filter.xml
    harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleAction.java
    harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelation.java

Modified: harmony/enhanced/classlib/trunk/modules/accessibility/make/findbugs-exclude-filter.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/accessibility/make/findbugs-exclude-filter.xml?rev=824372&r1=824371&r2=824372&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/accessibility/make/findbugs-exclude-filter.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/accessibility/make/findbugs-exclude-filter.xml Mon Oct 12 15:07:11 2009
@@ -33,5 +33,22 @@
         <Bug pattern="NP_TOSTRING_COULD_RETURN_NULL" />
     </Match> 
 
+    <!--
+        toString(String) calls are required for these instances, 
+        from HARMONY-6008 ([classlib] Fix japi found differences between harmony 
+        and spec)
+    -->
+    <Match>
+        <Class name="javax.accessibility.AccessibleAction" />
+        <Method name="&lt;clinit&gt;" />
+        <Bug pattern="DM_STRING_CTOR" />
+    </Match>
+    <Match>
+        <Class name="javax.accessibility.AccessibleRelation" />
+        <Method name="&lt;clinit&gt;" />
+        <Bug pattern="DM_STRING_CTOR" />
+    </Match> 
+
+
 </FindBugsFilter>
 

Modified: harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleAction.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleAction.java?rev=824372&r1=824371&r2=824372&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleAction.java (original)
+++ harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleAction.java Mon Oct 12 15:07:11 2009
@@ -18,9 +18,10 @@
 package javax.accessibility;
 
 public interface AccessibleAction {
-    static final String TOGGLE_EXPAND = "toggle expand"; //$NON-NLS-1$
-    static final String INCREMENT = "increment"; //$NON-NLS-1$
-    static final String DECREMENT = "decrement"; //$NON-NLS-1$
+    // Calls to new String(String) here are required - see HARMONY-6008
+    static final String TOGGLE_EXPAND = new String("toggle expand"); //$NON-NLS-1$
+    static final String INCREMENT = new String("increment"); //$NON-NLS-1$
+    static final String DECREMENT = new String("decrement"); //$NON-NLS-1$
 
     int getAccessibleActionCount();
 

Modified: harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelation.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelation.java?rev=824372&r1=824371&r2=824372&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelation.java (original)
+++ harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelation.java Mon Oct 12 15:07:11 2009
@@ -19,11 +19,12 @@
 
 
 public class AccessibleRelation extends AccessibleBundle {
-    public static final String LABEL_FOR = "labelFor"; //$NON-NLS-1$
-    public static final String LABELED_BY = "labeledBy"; //$NON-NLS-1$
-    public static final String MEMBER_OF = "memberOf"; //$NON-NLS-1$
-    public static final String CONTROLLER_FOR = "controllerFor"; //$NON-NLS-1$
-    public static final String CONTROLLED_BY = "controlledBy"; //$NON-NLS-1$
+    // Calls to new String(String) here are required - see HARMONY-6008
+    public static final String LABEL_FOR = new String("labelFor"); //$NON-NLS-1$
+    public static final String LABELED_BY = new String("labeledBy"); //$NON-NLS-1$
+    public static final String MEMBER_OF = new String("memberOf"); //$NON-NLS-1$
+    public static final String CONTROLLER_FOR = new String("controllerFor"); //$NON-NLS-1$
+    public static final String CONTROLLED_BY = new String("controlledBy"); //$NON-NLS-1$
     public static final String FLOWS_TO = "flowsTo"; //$NON-NLS-1$
     public static final String FLOWS_FROM = "flowsFrom"; //$NON-NLS-1$
     public static final String SUBWINDOW_OF = "subwindowOf"; //$NON-NLS-1$