svn commit: r773689 - in /incubator/pivot/trunk/wtk/src/pivot/wtkx: BindProcessor.java WTKXSerializer.java

[tv...@apache.org]

Author: tvolkert
Date: Mon May 11 20:54:35 2009
New Revision: 773689

URL: http://svn.apache.org/viewvc?rev=773689&view=rev
Log:
Changed NamedObjectsDictionary to NamedObjectDictionary

Modified:
    incubator/pivot/trunk/wtk/src/pivot/wtkx/BindProcessor.java
    incubator/pivot/trunk/wtk/src/pivot/wtkx/WTKXSerializer.java

Modified: incubator/pivot/trunk/wtk/src/pivot/wtkx/BindProcessor.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtkx/BindProcessor.java?rev=773689&r1=773688&r2=773689&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtkx/BindProcessor.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtkx/BindProcessor.java Mon May 11 20:54:35 2009
@@ -260,8 +260,8 @@
                 StringBuilder sourceCode = new StringBuilder("class _A {");
                 sourceCode.append("@Override ");
                 sourceCode.append("protected void bind(pivot.collections.Dictionary<String,");
-                sourceCode.append("pivot.collections.Dictionary<String, Object>> namedObjectsDictionaries) {");
-                sourceCode.append("super.bind(namedObjectsDictionaries);");
+                sourceCode.append("pivot.collections.Dictionary<String, Object>> namedObjectDictionaries) {");
+                sourceCode.append("super.bind(namedObjectDictionaries);");
 
                 sourceCode.append("pivot.wtkx.WTKXSerializer wtkxSerializer;");
                 sourceCode.append("Object object;");
@@ -335,7 +335,7 @@
                         // Public and protected fields get kept for subclasses
                         if ((loadField.mods.flags & (Flags.PUBLIC | Flags.PROTECTED)) != 0) {
                             sourceCode.append(String.format
-                                ("namedObjectsDictionaries.put(\"%s\", wtkxSerializer.getNamedObjects());", loadFieldName));
+                                ("namedObjectDictionaries.put(\"%s\", wtkxSerializer.getNamedObjects());", loadFieldName));
                         }
 
                         // Bind the resource lookups to their corresponding fields
@@ -388,7 +388,7 @@
                         }
 
                         sourceCode.append(String.format
-                            ("namedObjects = namedObjectsDictionaries.get(\"%s\");", loadFieldName));
+                            ("namedObjects = namedObjectDictionaries.get(\"%s\");", loadFieldName));
 
                         sourceCode.append
                             ("if (namedObjects == null) {");

Modified: incubator/pivot/trunk/wtk/src/pivot/wtkx/WTKXSerializer.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtkx/WTKXSerializer.java?rev=773689&r1=773688&r2=773689&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtkx/WTKXSerializer.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtkx/WTKXSerializer.java Mon May 11 20:54:35 2009
@@ -97,11 +97,11 @@
      *
      * @author tvolkert
      */
-    public final class NamedObjectsDictionary implements Dictionary<String, Object> {
+    public final class NamedObjectDictionary implements Dictionary<String, Object> {
         /**
          * Don't allow outside callers to create instances of this class.
          */
-        private NamedObjectsDictionary() {
+        private NamedObjectDictionary() {
         }
 
         /**
@@ -206,7 +206,7 @@
     private HashMap<String, Object> namedObjects = new HashMap<String, Object>();
     private HashMap<String, WTKXSerializer> includeSerializers = new HashMap<String, WTKXSerializer>();
 
-    private NamedObjectsDictionary namedObjectsDictionary = new NamedObjectsDictionary();
+    private NamedObjectDictionary namedObjectDictionary = new NamedObjectDictionary();
 
     private XMLInputFactory xmlInputFactory;
     private Object scriptEngineManager;
@@ -852,7 +852,7 @@
      */
     @SuppressWarnings("unchecked")
     public <T> T getObjectByName(String name) {
-        Object object = namedObjectsDictionary.get(name);
+        Object object = namedObjectDictionary.get(name);
         return (T)object;
     }
 
@@ -864,8 +864,8 @@
      * @return
      * The read-only named objects dictionary.
      */
-    public NamedObjectsDictionary getNamedObjects() {
-        return namedObjectsDictionary;
+    public NamedObjectDictionary getNamedObjects() {
+        return namedObjectDictionary;
     }
 
     private Object getObjectByID(String id) {