[Japi-cvs] SF.net SVN: japi:[1311] libs/swing-action/trunk/src/prj/net/sf/japi/swing/ action/DefaultActionBuilder.java

[<chr...@us...>]

Revision: 1311
          http://japi.svn.sourceforge.net/japi/?rev=1311&view=rev
Author:   christianhujer
Date:     2009-05-22 17:29:51 +0000 (Fri, 22 May 2009)

Log Message:
-----------
[2795498] ReflectionAction uses wrong bundle

Modified Paths:
--------------
    libs/swing-action/trunk/src/prj/net/sf/japi/swing/action/DefaultActionBuilder.java

Modified: libs/swing-action/trunk/src/prj/net/sf/japi/swing/action/DefaultActionBuilder.java
===================================================================
--- libs/swing-action/trunk/src/prj/net/sf/japi/swing/action/DefaultActionBuilder.java	2009-05-22 17:28:57 UTC (rev 1310)
+++ libs/swing-action/trunk/src/prj/net/sf/japi/swing/action/DefaultActionBuilder.java	2009-05-22 17:29:51 UTC (rev 1311)
@@ -91,11 +91,15 @@
         }
         @NotNull final ResourceBundle newBundle = getBundle(baseName);
         addBundle(newBundle);
-        @Nullable final String additionalBundles = newBundle.getString("ActionBuilder.additionalBundles");
-        if (additionalBundles != null) {
-            for (final String additionalBundle : additionalBundles.split("\\s+")) {
-                addBundle(additionalBundle);
+        try {
+            @Nullable final String additionalBundles = newBundle.getString("ActionBuilder.additionalBundles");
+            if (additionalBundles != null) {
+                for (final String additionalBundle : additionalBundles.split("\\s+")) {
+                    addBundle(additionalBundle);
+                }
             }
+        } catch (final MissingResourceException e) {
+            /* ignore - it is okay if a bundle specifies no additional bundles. */
         }
     }
 
@@ -177,11 +181,7 @@
      * @param key name of ActionBuilder.
      */
     public DefaultActionBuilder(final String key) {
-        try {
-            addBundle(key + ".action");
-        } catch (final MissingResourceException ignore) {
-            /* ignore */
-        }
+        addBundle(key + ".action");
     }
 
     /** Get the ActionMap.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.