You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2009/10/12 17:35:55 UTC

svn commit: r824387 - in /harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility: AccessibleAction.java AccessibleContext.java AccessibleRelation.java AccessibleResourceBundle.java AccessibleRole.java AccessibleState.java

Author: tellison
Date: Mon Oct 12 15:35:55 2009
New Revision: 824387

URL: http://svn.apache.org/viewvc?rev=824387&view=rev
Log:
Suppress NLS warnings in a more sensible manner.

Modified:
    harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleAction.java
    harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleContext.java
    harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelation.java
    harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleResourceBundle.java
    harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleRole.java
    harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleState.java

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=824387&r1=824386&r2=824387&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:35:55 2009
@@ -17,11 +17,12 @@
 
 package javax.accessibility;
 
+@SuppressWarnings("nls")
 public interface AccessibleAction {
     // 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$
+    static final String TOGGLE_EXPAND = new String("toggle expand");
+    static final String INCREMENT = new String("increment");
+    static final String DECREMENT = new String("decrement");
 
     int getAccessibleActionCount();
 

Modified: harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleContext.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleContext.java?rev=824387&r1=824386&r2=824387&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleContext.java (original)
+++ harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleContext.java Mon Oct 12 15:35:55 2009
@@ -27,29 +27,30 @@
 
 import javax.swing.event.SwingPropertyChangeSupport;
 
+@SuppressWarnings("nls")
 public abstract class AccessibleContext{
-    public static final String ACCESSIBLE_NAME_PROPERTY = "AccessibleName"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_DESCRIPTION_PROPERTY = "AccessibleDescription"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_STATE_PROPERTY = "AccessibleState"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_VALUE_PROPERTY = "AccessibleValue"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_SELECTION_PROPERTY = "AccessibleSelection"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_CARET_PROPERTY = "AccessibleCaret"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_VISIBLE_DATA_PROPERTY = "AccessibleVisibleData"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_CHILD_PROPERTY = "AccessibleChild"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_ACTIVE_DESCENDANT_PROPERTY = "AccessibleActiveDescendant"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_TABLE_CAPTION_CHANGED = "accessibleTableCaptionChanged"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_TABLE_SUMMARY_CHANGED = "accessibleTableSummaryChanged"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_TABLE_MODEL_CHANGED = "accessibleTableModelChanged"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_TABLE_ROW_HEADER_CHANGED = "accessibleTableRowHeaderChanged"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_TABLE_ROW_DESCRIPTION_CHANGED = "accessibleTableRowDescriptionChanged"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_TABLE_COLUMN_HEADER_CHANGED = "accessibleTableColumnHeaderChanged"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_TABLE_COLUMN_DESCRIPTION_CHANGED = "accessibleTableColumnDescriptionChanged"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_ACTION_PROPERTY = "accessibleActionProperty"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_HYPERTEXT_OFFSET = "AccessibleHypertextOffset"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_TEXT_PROPERTY = "AccessibleText"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_INVALIDATE_CHILDREN = "accessibleInvalidateChildren"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_TEXT_ATTRIBUTES_CHANGED = "accessibleTextAttributesChanged"; //$NON-NLS-1$
-    public static final String ACCESSIBLE_COMPONENT_BOUNDS_CHANGED = "accessibleComponentBoundsChanged"; //$NON-NLS-1$
+    public static final String ACCESSIBLE_NAME_PROPERTY = "AccessibleName";
+    public static final String ACCESSIBLE_DESCRIPTION_PROPERTY = "AccessibleDescription";
+    public static final String ACCESSIBLE_STATE_PROPERTY = "AccessibleState";
+    public static final String ACCESSIBLE_VALUE_PROPERTY = "AccessibleValue";
+    public static final String ACCESSIBLE_SELECTION_PROPERTY = "AccessibleSelection";
+    public static final String ACCESSIBLE_CARET_PROPERTY = "AccessibleCaret";
+    public static final String ACCESSIBLE_VISIBLE_DATA_PROPERTY = "AccessibleVisibleData";
+    public static final String ACCESSIBLE_CHILD_PROPERTY = "AccessibleChild";
+    public static final String ACCESSIBLE_ACTIVE_DESCENDANT_PROPERTY = "AccessibleActiveDescendant";
+    public static final String ACCESSIBLE_TABLE_CAPTION_CHANGED = "accessibleTableCaptionChanged";
+    public static final String ACCESSIBLE_TABLE_SUMMARY_CHANGED = "accessibleTableSummaryChanged";
+    public static final String ACCESSIBLE_TABLE_MODEL_CHANGED = "accessibleTableModelChanged";
+    public static final String ACCESSIBLE_TABLE_ROW_HEADER_CHANGED = "accessibleTableRowHeaderChanged";
+    public static final String ACCESSIBLE_TABLE_ROW_DESCRIPTION_CHANGED = "accessibleTableRowDescriptionChanged";
+    public static final String ACCESSIBLE_TABLE_COLUMN_HEADER_CHANGED = "accessibleTableColumnHeaderChanged";
+    public static final String ACCESSIBLE_TABLE_COLUMN_DESCRIPTION_CHANGED = "accessibleTableColumnDescriptionChanged";
+    public static final String ACCESSIBLE_ACTION_PROPERTY = "accessibleActionProperty";
+    public static final String ACCESSIBLE_HYPERTEXT_OFFSET = "AccessibleHypertextOffset";
+    public static final String ACCESSIBLE_TEXT_PROPERTY = "AccessibleText";
+    public static final String ACCESSIBLE_INVALIDATE_CHILDREN = "accessibleInvalidateChildren";
+    public static final String ACCESSIBLE_TEXT_ATTRIBUTES_CHANGED = "accessibleTextAttributesChanged";
+    public static final String ACCESSIBLE_COMPONENT_BOUNDS_CHANGED = "accessibleComponentBoundsChanged";
 
     protected Accessible accessibleParent;
     protected String accessibleName;

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=824387&r1=824386&r2=824387&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:35:55 2009
@@ -18,32 +18,33 @@
 package javax.accessibility;
 
 
+@SuppressWarnings("nls")
 public class AccessibleRelation extends AccessibleBundle {
     // 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$
-    public static final String PARENT_WINDOW_OF = "parentWindowOf"; //$NON-NLS-1$
-    public static final String EMBEDS = "embeds"; //$NON-NLS-1$
-    public static final String EMBEDDED_BY = "embeddedBy"; //$NON-NLS-1$
-    public static final String CHILD_NODE_OF = "childNodeOf"; //$NON-NLS-1$
-    public static final String LABEL_FOR_PROPERTY = "labelForProperty"; //$NON-NLS-1$
-    public static final String LABELED_BY_PROPERTY = "labeledByProperty"; //$NON-NLS-1$
-    public static final String MEMBER_OF_PROPERTY = "memberOfProperty"; //$NON-NLS-1$
-    public static final String CONTROLLER_FOR_PROPERTY = "controllerForProperty"; //$NON-NLS-1$
-    public static final String CONTROLLED_BY_PROPERTY = "controlledByProperty"; //$NON-NLS-1$
-    public static final String FLOWS_TO_PROPERTY = "flowsToProperty"; //$NON-NLS-1$
-    public static final String FLOWS_FROM_PROPERTY = "flowsFromProperty"; //$NON-NLS-1$
-    public static final String SUBWINDOW_OF_PROPERTY = "subwindowOfProperty"; //$NON-NLS-1$
-    public static final String PARENT_WINDOW_OF_PROPERTY = "parentWindowOfProperty"; //$NON-NLS-1$
-    public static final String EMBEDS_PROPERTY = "embedsProperty"; //$NON-NLS-1$
-    public static final String EMBEDDED_BY_PROPERTY = "embeddedByProperty"; //$NON-NLS-1$
-    public static final String CHILD_NODE_OF_PROPERTY = "childNodeOfProperty"; //$NON-NLS-1$
+    public static final String LABEL_FOR = new String("labelFor");
+    public static final String LABELED_BY = new String("labeledBy");
+    public static final String MEMBER_OF = new String("memberOf");
+    public static final String CONTROLLER_FOR = new String("controllerFor");
+    public static final String CONTROLLED_BY = new String("controlledBy");
+    public static final String FLOWS_TO = "flowsTo";
+    public static final String FLOWS_FROM = "flowsFrom";
+    public static final String SUBWINDOW_OF = "subwindowOf";
+    public static final String PARENT_WINDOW_OF = "parentWindowOf";
+    public static final String EMBEDS = "embeds";
+    public static final String EMBEDDED_BY = "embeddedBy";
+    public static final String CHILD_NODE_OF = "childNodeOf";
+    public static final String LABEL_FOR_PROPERTY = "labelForProperty";
+    public static final String LABELED_BY_PROPERTY = "labeledByProperty";
+    public static final String MEMBER_OF_PROPERTY = "memberOfProperty";
+    public static final String CONTROLLER_FOR_PROPERTY = "controllerForProperty";
+    public static final String CONTROLLED_BY_PROPERTY = "controlledByProperty";
+    public static final String FLOWS_TO_PROPERTY = "flowsToProperty";
+    public static final String FLOWS_FROM_PROPERTY = "flowsFromProperty";
+    public static final String SUBWINDOW_OF_PROPERTY = "subwindowOfProperty";
+    public static final String PARENT_WINDOW_OF_PROPERTY = "parentWindowOfProperty";
+    public static final String EMBEDS_PROPERTY = "embedsProperty";
+    public static final String EMBEDDED_BY_PROPERTY = "embeddedByProperty";
+    public static final String CHILD_NODE_OF_PROPERTY = "childNodeOfProperty";
 
     private Object[] targets;
 

Modified: harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleResourceBundle.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleResourceBundle.java?rev=824387&r1=824386&r2=824387&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleResourceBundle.java (original)
+++ harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleResourceBundle.java Mon Oct 12 15:35:55 2009
@@ -22,110 +22,111 @@
 @Deprecated
 public class AccessibleResourceBundle extends ListResourceBundle {
     // Localized values representing the accessible roles and states of the accessible components.
+    @SuppressWarnings("nls")
     private final Object[][] contents = {
-        {"alert", "alert"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"column_header", "column header"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"canvas", "canvas"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"combobox", "combobox"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"desktopIcon", "desktop icon"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"internalFrame", "internal frame"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"desktopPane", "desktop pane"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"optionPane", "option pane"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"window", "window"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"frame", "frame"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"dialog", "dialog"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"colorChooser", "color chooser"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"directoryPane", "directory pane"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"fileChooser", "file chooser"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"filler", "filler"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"hyperlink", "hyperlink"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"icon", "icon"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"label", "label"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"rootPane", "root pane"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"glassPane", "glass pane"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"layeredPane", "layered pane"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"list", "list"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"listItem", "list item"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"menuBar", "menu bar"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"popupMenu", "popup menu"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"menu", "menu"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"menuItem", "menu item"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"separator", "separator"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"pageTabList", "page tab list"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"pageTab", "page tab"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"panel", "panel"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"progressBar", "progress"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"passwordText", "password"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"pushButton", "push button"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"toggleButton", "toggle button"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"checkBox", "check box"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"radioButton", "radio button"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"rowHeader", "row header"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"scrollPane", "scroll pane"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"scrollBar", "scroller"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"viewport", "viewport"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"slider", "slider"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"splitPane", "split pane"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"table", "table"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"text", "text"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"tree", "tree"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"toolBar", "tool bar"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"toolTip", "tool tip"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"awtComponent", "AWT component"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"swingComponent", "Swing component"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"unknown", "unknown"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"statusBar", "status bar"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"dateEditor", "date editor"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"spinBox", "spinner"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"fontChooser", "font chooser"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"groupBox", "group"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"header", "header"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"footer", "footer"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"paragraph", "paragraph"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"ruler", "ruler"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"editBar", "edit bar"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"progressMonitor", "progress monitor"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"labelFor", "label for"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"labeledBy", "labeled by"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"memberOf", "member of"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"controllerFor", "controller for"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"controlledBy", "controlled by"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"flowsTo", "flows to"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"flowsFrom", "flows from"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"subwindowOf", "sub-window of"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"parentWindowOf", "parent window of"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"embeds", "embeds"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"embeddedBy", "embedded by"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"childNodeOf", "child node of"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"active", "active"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"pressed", "pressed"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"armed", "armed"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"busy", "busy"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"checked", "checked"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"editable", "editable"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"expandable", "expandable"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"collapsed", "collapsed"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"expanded", "expanded"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"enabled", "enabled"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"focusable", "focusable"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"focused", "focused"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"iconified", "iconified"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"modal", "modal"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"opaque", "opaque"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"resizable", "resizable"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"multiSelectable", "multi-selectable"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"selectable", "selectable"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"selected", "selected"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"showing", "showing"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"visible", "visible"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"vertical", "vertical"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"horizontal", "horizontal"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"singleLine", "singleLine"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"multiLine", "multi line"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"transient", "transient"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"managesDescendants", "manages descendants"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"indeterminate", "indeterminate"}, //$NON-NLS-1$ //$NON-NLS-2$
-        {"truncated", "truncated"}, //$NON-NLS-1$ //$NON-NLS-2$
+        {"alert", "alert"},
+        {"column_header", "column header"},
+        {"canvas", "canvas"},
+        {"combobox", "combobox"},
+        {"desktopIcon", "desktop icon"},
+        {"internalFrame", "internal frame"},
+        {"desktopPane", "desktop pane"},
+        {"optionPane", "option pane"},
+        {"window", "window"},
+        {"frame", "frame"},
+        {"dialog", "dialog"},
+        {"colorChooser", "color chooser"},
+        {"directoryPane", "directory pane"},
+        {"fileChooser", "file chooser"},
+        {"filler", "filler"},
+        {"hyperlink", "hyperlink"},
+        {"icon", "icon"},
+        {"label", "label"},
+        {"rootPane", "root pane"},
+        {"glassPane", "glass pane"},
+        {"layeredPane", "layered pane"},
+        {"list", "list"},
+        {"listItem", "list item"},
+        {"menuBar", "menu bar"},
+        {"popupMenu", "popup menu"},
+        {"menu", "menu"},
+        {"menuItem", "menu item"},
+        {"separator", "separator"},
+        {"pageTabList", "page tab list"},
+        {"pageTab", "page tab"},
+        {"panel", "panel"},
+        {"progressBar", "progress"},
+        {"passwordText", "password"},
+        {"pushButton", "push button"},
+        {"toggleButton", "toggle button"},
+        {"checkBox", "check box"},
+        {"radioButton", "radio button"},
+        {"rowHeader", "row header"},
+        {"scrollPane", "scroll pane"},
+        {"scrollBar", "scroller"},
+        {"viewport", "viewport"},
+        {"slider", "slider"},
+        {"splitPane", "split pane"},
+        {"table", "table"},
+        {"text", "text"},
+        {"tree", "tree"},
+        {"toolBar", "tool bar"},
+        {"toolTip", "tool tip"},
+        {"awtComponent", "AWT component"},
+        {"swingComponent", "Swing component"},
+        {"unknown", "unknown"},
+        {"statusBar", "status bar"},
+        {"dateEditor", "date editor"},
+        {"spinBox", "spinner"},
+        {"fontChooser", "font chooser"},
+        {"groupBox", "group"},
+        {"header", "header"},
+        {"footer", "footer"},
+        {"paragraph", "paragraph"},
+        {"ruler", "ruler"},
+        {"editBar", "edit bar"},
+        {"progressMonitor", "progress monitor"},
+        {"labelFor", "label for"},
+        {"labeledBy", "labeled by"},
+        {"memberOf", "member of"},
+        {"controllerFor", "controller for"},
+        {"controlledBy", "controlled by"},
+        {"flowsTo", "flows to"},
+        {"flowsFrom", "flows from"},
+        {"subwindowOf", "sub-window of"},
+        {"parentWindowOf", "parent window of"},
+        {"embeds", "embeds"},
+        {"embeddedBy", "embedded by"},
+        {"childNodeOf", "child node of"},
+        {"active", "active"},
+        {"pressed", "pressed"},
+        {"armed", "armed"},
+        {"busy", "busy"},
+        {"checked", "checked"},
+        {"editable", "editable"},
+        {"expandable", "expandable"},
+        {"collapsed", "collapsed"},
+        {"expanded", "expanded"},
+        {"enabled", "enabled"},
+        {"focusable", "focusable"},
+        {"focused", "focused"},
+        {"iconified", "iconified"},
+        {"modal", "modal"},
+        {"opaque", "opaque"},
+        {"resizable", "resizable"},
+        {"multiSelectable", "multi-selectable"},
+        {"selectable", "selectable"},
+        {"selected", "selected"},
+        {"showing", "showing"},
+        {"visible", "visible"},
+        {"vertical", "vertical"},
+        {"horizontal", "horizontal"},
+        {"singleLine", "singleLine"},
+        {"multiLine", "multi line"},
+        {"transient", "transient"},
+        {"managesDescendants", "manages descendants"},
+        {"indeterminate", "indeterminate"},
+        {"truncated", "truncated"},
     };
 
     @Override

Modified: harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleRole.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleRole.java?rev=824387&r1=824386&r2=824387&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleRole.java (original)
+++ harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleRole.java Mon Oct 12 15:35:55 2009
@@ -21,69 +21,70 @@
 
 package javax.accessibility;
 
+@SuppressWarnings("nls")
 public class AccessibleRole extends AccessibleBundle {
-    public static final AccessibleRole ALERT = new AccessibleRole("alert"); //$NON-NLS-1$
-    public static final AccessibleRole COLUMN_HEADER = new AccessibleRole("columnHeader"); //$NON-NLS-1$
-    public static final AccessibleRole CANVAS = new AccessibleRole("canvas"); //$NON-NLS-1$
-    public static final AccessibleRole COMBO_BOX = new AccessibleRole("combobox"); //$NON-NLS-1$
-    public static final AccessibleRole DESKTOP_ICON = new AccessibleRole("desktopIcon"); //$NON-NLS-1$
-    public static final AccessibleRole INTERNAL_FRAME = new AccessibleRole("internalFrame"); //$NON-NLS-1$
-    public static final AccessibleRole DESKTOP_PANE = new AccessibleRole("desktopPane"); //$NON-NLS-1$
-    public static final AccessibleRole OPTION_PANE = new AccessibleRole("optionPane"); //$NON-NLS-1$
-    public static final AccessibleRole WINDOW = new AccessibleRole("window"); //$NON-NLS-1$
-    public static final AccessibleRole FRAME = new AccessibleRole("frame"); //$NON-NLS-1$
-    public static final AccessibleRole DIALOG = new AccessibleRole("dialog"); //$NON-NLS-1$
-    public static final AccessibleRole COLOR_CHOOSER = new AccessibleRole("colorChooser"); //$NON-NLS-1$
-    public static final AccessibleRole DIRECTORY_PANE = new AccessibleRole("directoryPane"); //$NON-NLS-1$
-    public static final AccessibleRole FILE_CHOOSER = new AccessibleRole("fileChooser"); //$NON-NLS-1$
-    public static final AccessibleRole FILLER = new AccessibleRole("filler"); //$NON-NLS-1$
-    public static final AccessibleRole HYPERLINK = new AccessibleRole("hyperlink"); //$NON-NLS-1$
-    public static final AccessibleRole ICON = new AccessibleRole("icon"); //$NON-NLS-1$
-    public static final AccessibleRole LABEL = new AccessibleRole("label"); //$NON-NLS-1$
-    public static final AccessibleRole ROOT_PANE = new AccessibleRole("rootPane"); //$NON-NLS-1$
-    public static final AccessibleRole GLASS_PANE = new AccessibleRole("glassPane"); //$NON-NLS-1$
-    public static final AccessibleRole LAYERED_PANE = new AccessibleRole("layeredPane"); //$NON-NLS-1$
-    public static final AccessibleRole LIST = new AccessibleRole("list"); //$NON-NLS-1$
-    public static final AccessibleRole LIST_ITEM = new AccessibleRole("listItem"); //$NON-NLS-1$
-    public static final AccessibleRole MENU_BAR = new AccessibleRole("menuBar"); //$NON-NLS-1$
-    public static final AccessibleRole POPUP_MENU = new AccessibleRole("popupMenu"); //$NON-NLS-1$
-    public static final AccessibleRole MENU = new AccessibleRole("menu"); //$NON-NLS-1$
-    public static final AccessibleRole MENU_ITEM = new AccessibleRole("menuItem"); //$NON-NLS-1$
-    public static final AccessibleRole SEPARATOR = new AccessibleRole("separator"); //$NON-NLS-1$
-    public static final AccessibleRole PAGE_TAB_LIST = new AccessibleRole("pageTabList"); //$NON-NLS-1$
-    public static final AccessibleRole PAGE_TAB = new AccessibleRole("pageTab"); //$NON-NLS-1$
-    public static final AccessibleRole PANEL = new AccessibleRole("panel"); //$NON-NLS-1$
-    public static final AccessibleRole PROGRESS_BAR = new AccessibleRole("progressBar"); //$NON-NLS-1$
-    public static final AccessibleRole PASSWORD_TEXT = new AccessibleRole("passwordText"); //$NON-NLS-1$
-    public static final AccessibleRole PUSH_BUTTON = new AccessibleRole("pushButton"); //$NON-NLS-1$
-    public static final AccessibleRole TOGGLE_BUTTON = new AccessibleRole("toggleButton"); //$NON-NLS-1$
-    public static final AccessibleRole CHECK_BOX = new AccessibleRole("checkBox"); //$NON-NLS-1$
-    public static final AccessibleRole RADIO_BUTTON = new AccessibleRole("radioButton"); //$NON-NLS-1$
-    public static final AccessibleRole ROW_HEADER = new AccessibleRole("rowHeader"); //$NON-NLS-1$
-    public static final AccessibleRole SCROLL_PANE = new AccessibleRole("scrollPane"); //$NON-NLS-1$
-    public static final AccessibleRole SCROLL_BAR = new AccessibleRole("scrollBar"); //$NON-NLS-1$
-    public static final AccessibleRole VIEWPORT = new AccessibleRole("viewport"); //$NON-NLS-1$
-    public static final AccessibleRole SLIDER = new AccessibleRole("slider"); //$NON-NLS-1$
-    public static final AccessibleRole SPLIT_PANE = new AccessibleRole("splitPane"); //$NON-NLS-1$
-    public static final AccessibleRole TABLE = new AccessibleRole("table"); //$NON-NLS-1$
-    public static final AccessibleRole TEXT = new AccessibleRole("text"); //$NON-NLS-1$
-    public static final AccessibleRole TREE = new AccessibleRole("tree"); //$NON-NLS-1$
-    public static final AccessibleRole TOOL_BAR = new AccessibleRole("toolBar"); //$NON-NLS-1$
-    public static final AccessibleRole TOOL_TIP = new AccessibleRole("toolTip"); //$NON-NLS-1$
-    public static final AccessibleRole AWT_COMPONENT = new AccessibleRole("awtComponent"); //$NON-NLS-1$
-    public static final AccessibleRole SWING_COMPONENT = new AccessibleRole("swingComponent"); //$NON-NLS-1$
-    public static final AccessibleRole UNKNOWN = new AccessibleRole("unknown"); //$NON-NLS-1$
-    public static final AccessibleRole STATUS_BAR = new AccessibleRole("statusBar"); //$NON-NLS-1$
-    public static final AccessibleRole DATE_EDITOR = new AccessibleRole("dateEditor"); //$NON-NLS-1$
-    public static final AccessibleRole SPIN_BOX = new AccessibleRole("spinBox"); //$NON-NLS-1$
-    public static final AccessibleRole FONT_CHOOSER = new AccessibleRole("fontChooser"); //$NON-NLS-1$
-    public static final AccessibleRole GROUP_BOX = new AccessibleRole("groupBox"); //$NON-NLS-1$
-    public static final AccessibleRole HEADER = new AccessibleRole("header"); //$NON-NLS-1$
-    public static final AccessibleRole FOOTER = new AccessibleRole("footer"); //$NON-NLS-1$
-    public static final AccessibleRole PARAGRAPH = new AccessibleRole("paragraph"); //$NON-NLS-1$
-    public static final AccessibleRole RULER = new AccessibleRole("ruler"); //$NON-NLS-1$
-    public static final AccessibleRole EDITBAR = new AccessibleRole("editBar"); //$NON-NLS-1$
-    public static final AccessibleRole PROGRESS_MONITOR = new AccessibleRole("progressMonitor"); //$NON-NLS-1$
+    public static final AccessibleRole ALERT = new AccessibleRole("alert");
+    public static final AccessibleRole COLUMN_HEADER = new AccessibleRole("columnHeader");
+    public static final AccessibleRole CANVAS = new AccessibleRole("canvas");
+    public static final AccessibleRole COMBO_BOX = new AccessibleRole("combobox");
+    public static final AccessibleRole DESKTOP_ICON = new AccessibleRole("desktopIcon");
+    public static final AccessibleRole INTERNAL_FRAME = new AccessibleRole("internalFrame");
+    public static final AccessibleRole DESKTOP_PANE = new AccessibleRole("desktopPane");
+    public static final AccessibleRole OPTION_PANE = new AccessibleRole("optionPane");
+    public static final AccessibleRole WINDOW = new AccessibleRole("window");
+    public static final AccessibleRole FRAME = new AccessibleRole("frame");
+    public static final AccessibleRole DIALOG = new AccessibleRole("dialog");
+    public static final AccessibleRole COLOR_CHOOSER = new AccessibleRole("colorChooser");
+    public static final AccessibleRole DIRECTORY_PANE = new AccessibleRole("directoryPane");
+    public static final AccessibleRole FILE_CHOOSER = new AccessibleRole("fileChooser");
+    public static final AccessibleRole FILLER = new AccessibleRole("filler");
+    public static final AccessibleRole HYPERLINK = new AccessibleRole("hyperlink");
+    public static final AccessibleRole ICON = new AccessibleRole("icon");
+    public static final AccessibleRole LABEL = new AccessibleRole("label");
+    public static final AccessibleRole ROOT_PANE = new AccessibleRole("rootPane");
+    public static final AccessibleRole GLASS_PANE = new AccessibleRole("glassPane");
+    public static final AccessibleRole LAYERED_PANE = new AccessibleRole("layeredPane");
+    public static final AccessibleRole LIST = new AccessibleRole("list");
+    public static final AccessibleRole LIST_ITEM = new AccessibleRole("listItem");
+    public static final AccessibleRole MENU_BAR = new AccessibleRole("menuBar");
+    public static final AccessibleRole POPUP_MENU = new AccessibleRole("popupMenu");
+    public static final AccessibleRole MENU = new AccessibleRole("menu");
+    public static final AccessibleRole MENU_ITEM = new AccessibleRole("menuItem");
+    public static final AccessibleRole SEPARATOR = new AccessibleRole("separator");
+    public static final AccessibleRole PAGE_TAB_LIST = new AccessibleRole("pageTabList");
+    public static final AccessibleRole PAGE_TAB = new AccessibleRole("pageTab");
+    public static final AccessibleRole PANEL = new AccessibleRole("panel");
+    public static final AccessibleRole PROGRESS_BAR = new AccessibleRole("progressBar");
+    public static final AccessibleRole PASSWORD_TEXT = new AccessibleRole("passwordText");
+    public static final AccessibleRole PUSH_BUTTON = new AccessibleRole("pushButton");
+    public static final AccessibleRole TOGGLE_BUTTON = new AccessibleRole("toggleButton");
+    public static final AccessibleRole CHECK_BOX = new AccessibleRole("checkBox");
+    public static final AccessibleRole RADIO_BUTTON = new AccessibleRole("radioButton");
+    public static final AccessibleRole ROW_HEADER = new AccessibleRole("rowHeader");
+    public static final AccessibleRole SCROLL_PANE = new AccessibleRole("scrollPane");
+    public static final AccessibleRole SCROLL_BAR = new AccessibleRole("scrollBar");
+    public static final AccessibleRole VIEWPORT = new AccessibleRole("viewport");
+    public static final AccessibleRole SLIDER = new AccessibleRole("slider");
+    public static final AccessibleRole SPLIT_PANE = new AccessibleRole("splitPane");
+    public static final AccessibleRole TABLE = new AccessibleRole("table");
+    public static final AccessibleRole TEXT = new AccessibleRole("text");
+    public static final AccessibleRole TREE = new AccessibleRole("tree");
+    public static final AccessibleRole TOOL_BAR = new AccessibleRole("toolBar");
+    public static final AccessibleRole TOOL_TIP = new AccessibleRole("toolTip");
+    public static final AccessibleRole AWT_COMPONENT = new AccessibleRole("awtComponent");
+    public static final AccessibleRole SWING_COMPONENT = new AccessibleRole("swingComponent");
+    public static final AccessibleRole UNKNOWN = new AccessibleRole("unknown");
+    public static final AccessibleRole STATUS_BAR = new AccessibleRole("statusBar");
+    public static final AccessibleRole DATE_EDITOR = new AccessibleRole("dateEditor");
+    public static final AccessibleRole SPIN_BOX = new AccessibleRole("spinBox");
+    public static final AccessibleRole FONT_CHOOSER = new AccessibleRole("fontChooser");
+    public static final AccessibleRole GROUP_BOX = new AccessibleRole("groupBox");
+    public static final AccessibleRole HEADER = new AccessibleRole("header");
+    public static final AccessibleRole FOOTER = new AccessibleRole("footer");
+    public static final AccessibleRole PARAGRAPH = new AccessibleRole("paragraph");
+    public static final AccessibleRole RULER = new AccessibleRole("ruler");
+    public static final AccessibleRole EDITBAR = new AccessibleRole("editBar");
+    public static final AccessibleRole PROGRESS_MONITOR = new AccessibleRole("progressMonitor");
 
     protected AccessibleRole(final String key) {
         this.key = key;

Modified: harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleState.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleState.java?rev=824387&r1=824386&r2=824387&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleState.java (original)
+++ harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleState.java Mon Oct 12 15:35:55 2009
@@ -21,36 +21,37 @@
 
 package javax.accessibility;
 
+@SuppressWarnings("nls")
 public class AccessibleState extends AccessibleBundle {
-    public static final AccessibleState ACTIVE = new AccessibleState("active"); //$NON-NLS-1$
-    public static final AccessibleState PRESSED = new AccessibleState("pressed"); //$NON-NLS-1$
-    public static final AccessibleState ARMED = new AccessibleState("armed"); //$NON-NLS-1$
-    public static final AccessibleState BUSY = new AccessibleState("busy"); //$NON-NLS-1$
-    public static final AccessibleState CHECKED = new AccessibleState("checked"); //$NON-NLS-1$
-    public static final AccessibleState EDITABLE = new AccessibleState("editable"); //$NON-NLS-1$
-    public static final AccessibleState EXPANDABLE = new AccessibleState("expandable"); //$NON-NLS-1$
-    public static final AccessibleState COLLAPSED = new AccessibleState("collapsed"); //$NON-NLS-1$
-    public static final AccessibleState EXPANDED = new AccessibleState("expanded"); //$NON-NLS-1$
-    public static final AccessibleState ENABLED = new AccessibleState("enabled"); //$NON-NLS-1$
-    public static final AccessibleState FOCUSABLE = new AccessibleState("focusable"); //$NON-NLS-1$
-    public static final AccessibleState FOCUSED = new AccessibleState("focused"); //$NON-NLS-1$
-    public static final AccessibleState ICONIFIED = new AccessibleState("iconified"); //$NON-NLS-1$
-    public static final AccessibleState MODAL = new AccessibleState("modal"); //$NON-NLS-1$
-    public static final AccessibleState OPAQUE = new AccessibleState("opaque"); //$NON-NLS-1$
-    public static final AccessibleState RESIZABLE = new AccessibleState("resizable"); //$NON-NLS-1$
-    public static final AccessibleState MULTISELECTABLE = new AccessibleState("multiSelectable"); //$NON-NLS-1$
-    public static final AccessibleState SELECTABLE = new AccessibleState("selectable"); //$NON-NLS-1$
-    public static final AccessibleState SELECTED = new AccessibleState("selected"); //$NON-NLS-1$
-    public static final AccessibleState SHOWING = new AccessibleState("showing"); //$NON-NLS-1$
-    public static final AccessibleState VISIBLE = new AccessibleState("visible"); //$NON-NLS-1$
-    public static final AccessibleState VERTICAL = new AccessibleState("vertical"); //$NON-NLS-1$
-    public static final AccessibleState HORIZONTAL = new AccessibleState("horizontal"); //$NON-NLS-1$
-    public static final AccessibleState SINGLE_LINE = new AccessibleState("singleLine"); //$NON-NLS-1$
-    public static final AccessibleState MULTI_LINE = new AccessibleState("multiLine"); //$NON-NLS-1$
-    public static final AccessibleState TRANSIENT = new AccessibleState("transient"); //$NON-NLS-1$
-    public static final AccessibleState MANAGES_DESCENDANTS = new AccessibleState("managesDescendants"); //$NON-NLS-1$
-    public static final AccessibleState INDETERMINATE = new AccessibleState("indeterminate"); //$NON-NLS-1$
-    public static final AccessibleState TRUNCATED = new AccessibleState("truncated"); //$NON-NLS-1$
+    public static final AccessibleState ACTIVE = new AccessibleState("active");
+    public static final AccessibleState PRESSED = new AccessibleState("pressed");
+    public static final AccessibleState ARMED = new AccessibleState("armed");
+    public static final AccessibleState BUSY = new AccessibleState("busy");
+    public static final AccessibleState CHECKED = new AccessibleState("checked");
+    public static final AccessibleState EDITABLE = new AccessibleState("editable");
+    public static final AccessibleState EXPANDABLE = new AccessibleState("expandable");
+    public static final AccessibleState COLLAPSED = new AccessibleState("collapsed");
+    public static final AccessibleState EXPANDED = new AccessibleState("expanded");
+    public static final AccessibleState ENABLED = new AccessibleState("enabled");
+    public static final AccessibleState FOCUSABLE = new AccessibleState("focusable");
+    public static final AccessibleState FOCUSED = new AccessibleState("focused");
+    public static final AccessibleState ICONIFIED = new AccessibleState("iconified");
+    public static final AccessibleState MODAL = new AccessibleState("modal");
+    public static final AccessibleState OPAQUE = new AccessibleState("opaque");
+    public static final AccessibleState RESIZABLE = new AccessibleState("resizable");
+    public static final AccessibleState MULTISELECTABLE = new AccessibleState("multiSelectable");
+    public static final AccessibleState SELECTABLE = new AccessibleState("selectable");
+    public static final AccessibleState SELECTED = new AccessibleState("selected");
+    public static final AccessibleState SHOWING = new AccessibleState("showing");
+    public static final AccessibleState VISIBLE = new AccessibleState("visible");
+    public static final AccessibleState VERTICAL = new AccessibleState("vertical");
+    public static final AccessibleState HORIZONTAL = new AccessibleState("horizontal");
+    public static final AccessibleState SINGLE_LINE = new AccessibleState("singleLine");
+    public static final AccessibleState MULTI_LINE = new AccessibleState("multiLine");
+    public static final AccessibleState TRANSIENT = new AccessibleState("transient");
+    public static final AccessibleState MANAGES_DESCENDANTS = new AccessibleState("managesDescendants");
+    public static final AccessibleState INDETERMINATE = new AccessibleState("indeterminate");
+    public static final AccessibleState TRUNCATED = new AccessibleState("truncated");
 
     protected AccessibleState(final String key) {
         this.key = key;