Thread: [Japi-cvs] SF.net SVN: japi:[657] libs/swing-about/trunk/src/prj/net/sf/japi/swing/ about/AboutDial

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 657
          http://japi.svn.sourceforge.net/japi/?rev=657&view=rev
Author:   christianhujer
Date:     2008-10-07 18:20:09 +0000 (Tue, 07 Oct 2008)

Log Message:
-----------
Improvements regarding exception handling and reuse.

Modified Paths:
--------------
    libs/swing-about/trunk/src/prj/net/sf/japi/swing/about/AboutDialog.java

Modified: libs/swing-about/trunk/src/prj/net/sf/japi/swing/about/AboutDialog.java
===================================================================

--- libs/swing-about/trunk/src/prj/net/sf/japi/swing/about/AboutDialog.java	2008-10-07 18:18:30 UTC (rev 656)
+++ libs/swing-about/trunk/src/prj/net/sf/japi/swing/about/AboutDialog.java	2008-10-07 18:20:09 UTC (rev 657)
@@ -27,13 +27,13 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.net.URL;
+import java.util.Collection;
 import java.util.Enumeration;
+import java.util.MissingResourceException;
 import java.util.Properties;
 import java.util.ResourceBundle;
-import java.util.SortedSet;
 import java.util.TreeSet;
 import javax.swing.ImageIcon;
-import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -180,7 +180,7 @@
      * Adds a tab.
      * @param component Component to add as tab
      */
-    public void addTab(@NotNull final Component component) {
+    public final void addTab(@NotNull final Component component) {
         tabs.add(component);
     }
 
@@ -202,7 +202,7 @@
      * @param number number of license
      * @return component for XY license tab
      */
-    @NotNull private JComponent buildLicenseSubTab(@NotNull final String number) {
+    @NotNull private Component buildLicenseSubTab(@NotNull final String number) {
         String licenseText;
         try {
             final Reader in = new InputStreamReader(new BufferedInputStream(getClass().getClassLoader().getResource(actionBuilder.getString("license." + number + ".file")).openStream()));
@@ -226,41 +226,45 @@
         license.setWrapStyleWord(true);
         license.setEditable(false);
         license.setFont(new Font("Monospaced", Font.PLAIN, license.getFont().getSize()));
-        final JScrollPane scroller = new JScrollPane(license);
+        final Component scroller = new JScrollPane(license);
         scroller.setFocusable(true);
         scroller.setName(actionBuilder.getString("license." + number + ".title"));
         return scroller;
     }
 
+    /** Gets a String from a bundle.
+     * @param bundle Bundle to get String from.
+     * @param key Key for which to get the String.
+     * @return String from the bundle or <code>null</code> if not available.
+     */
+    @Nullable private String getStringFromBundle(@NotNull final ResourceBundle bundle, @NotNull final String key) {
+        try {
+            return bundle.getString(key);
+        } catch (final MissingResourceException e) {
+            /* ignore */
+        } catch (final ClassCastException e) {
+            System.err.println("Internal error: value type for key " + key + " in " + bundle + " must be String.");
+        }
+        return null;
+    }
+
     /**
      * Build the about tab.
      * @return component for about tab
      */
-    @NotNull private JComponent buildAboutTab() {
+    @NotNull private Component buildAboutTab() {
         String buildNumber = ACTION_BUILDER.getString("unknown");
         String buildDeveloper = ACTION_BUILDER.getString("unknown");
         String buildTstamp = ACTION_BUILDER.getString("unknown");
         try {
             final ResourceBundle bundle = ResourceBundle.getBundle("build");
-            try {
-                buildDeveloper = bundle.getString("build.developer");
-            } catch (final Exception e) {
-                /* ignore */
-            }
-            try {
-                buildNumber = bundle.getString("build.number");
-            } catch (final Exception e) {
-                /* ignore */
-            }
-            try {
-                buildTstamp = bundle.getString("build.tstamp");
-            } catch (final Exception e) {
-                /* ignore */
-            }
-        } catch (final Exception e) {
+            buildDeveloper = getStringFromBundle(bundle, "build.developer");
+            buildNumber    = getStringFromBundle(bundle, "build.number");
+            buildTstamp    = getStringFromBundle(bundle, "build.tstamp");
+        } catch (final MissingResourceException e) {
             /* ignore */
         }
-        final JLabel aboutTab = new JLabel(actionBuilder.format("about", System.getProperty("java.version"), buildNumber, buildDeveloper, buildTstamp), SwingConstants.CENTER);
+        final Component aboutTab = new JLabel(actionBuilder.format("about", System.getProperty("java.version"), buildNumber, buildDeveloper, buildTstamp), SwingConstants.CENTER);
         aboutTab.setName(ACTION_BUILDER.getString("aboutTab.title"));
         return aboutTab;
     }
@@ -269,9 +273,9 @@
      * Build the runtime properties tab.
      * @return component for runtime properties tab
      */
-    @NotNull private JComponent buildRuntimePropertiesTab() {
+    @NotNull private Component buildRuntimePropertiesTab() {
         final StringBuilder propertiesText = new StringBuilder();
-        final SortedSet<String> keys = new TreeSet<String>();
+        final Collection<String> keys = new TreeSet<String>();
         final Properties props = System.getProperties();
         for (final Object key : props.keySet()) {
             if (key instanceof String) {
@@ -288,7 +292,7 @@
         final JTextArea properties = new JTextArea(propertiesText.toString(), TEXT_ROWS, TEXT_COLUMNS);
         properties.setEditable(false);
         properties.setFont(new Font("Monospaced", Font.PLAIN, properties.getFont().getSize()));
-        final JScrollPane scroller = new JScrollPane(properties);
+        final Component scroller = new JScrollPane(properties);
         scroller.setName(ACTION_BUILDER.getString("aboutRuntimeProperties.title"));
         scroller.setFocusable(true);
         return scroller;
@@ -298,28 +302,32 @@
      * Build the build properties tab.
      * @return component for build properties tab
      */
-    @NotNull private JComponent buildBuildPropertiesTab() {
+    @NotNull private Component buildBuildPropertiesTab() {
         final StringBuilder propertiesText = new StringBuilder();
-        final SortedSet<String> keys = new TreeSet<String>();
+        final Collection<String> keys = new TreeSet<String>();
         try {
             final ResourceBundle bundle = ResourceBundle.getBundle("build");
             for (final Enumeration<String> uKeys = bundle.getKeys(); uKeys.hasMoreElements();) {
                 keys.add(uKeys.nextElement());
             }
             for (final String key : keys) {
-                propertiesText
-                        .append(key)
-                        .append('=')
-                        .append(bundle.getString(key))
-                        .append('\n');
+                try {
+                    propertiesText
+                            .append(key)
+                            .append('=')
+                            .append(bundle.getString(key))
+                            .append('\n');
+                } catch (final ClassCastException e) {
+                    System.err.println("Internal error: expecting build properties to be Strings, but property for key " + key + " was not a String.");
+                }
             }
-        } catch (final Exception e) {
+        } catch (final MissingResourceException e) {
             propertiesText.append(e.toString());
         }
         final JTextArea properties = new JTextArea(propertiesText.toString(), TEXT_ROWS, TEXT_COLUMNS);
         properties.setEditable(false);
         properties.setFont(new Font("Monospaced", Font.PLAIN, properties.getFont().getSize()));
-        final JScrollPane scroller = new JScrollPane(properties);
+        final Component scroller = new JScrollPane(properties);
         scroller.setName(ACTION_BUILDER.getString("aboutBuildProperties.title"));
         scroller.setFocusable(true);
         return scroller;


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




Thread: [Japi-cvs] SF.net SVN: japi:[657] libs/swing-about/trunk/src/prj/net/sf/japi/swing/ about/AboutDial

japi-cvs