Fix warnings found by FindBugs

diff --git a/src/net/argius/stew/DaemonThreadFactory.java b/src/net/argius/stew/DaemonThreadFactory.java
index 340b6b5..e9336cf 100644 (file)
--- a/src/net/argius/stew/DaemonThreadFactory.java
+++ b/src/net/argius/stew/DaemonThreadFactory.java
@@ -10,11 +10,10 @@ public final class DaemonThreadFactory implements ThreadFactory {
     private static final Logger log = Logger.getLogger(DaemonThreadFactory.class);
 
     private static volatile int count;
-
-    private static ThreadFactory instance;
+    private static volatile ThreadFactory instance;
 
     private DaemonThreadFactory() {
-    }
+    } // forbidden
 
     /**
      * Returns an instance of DaemonThreadFactory (as ThreadFactory).

diff --git a/src/net/argius/stew/Environment.java b/src/net/argius/stew/Environment.java
index 8f2836a..01b5dbd 100644 (file)
--- a/src/net/argius/stew/Environment.java
+++ b/src/net/argius/stew/Environment.java
@@ -139,7 +139,10 @@ public final class Environment {
             }
             try {
                 conn.close();
-                log.debug("disconnected %s (conn=%08x, env=%08x)", connector.getId(), conn.hashCode(), hashCode());
+                if (log.isDebugEnabled()) {
+                    final String id = (connector == null) ? "null" : connector.getId();
+                    log.debug("disconnected %s (conn=%08x, env=%08x)", id, conn.hashCode(), hashCode());
+                }
                 if (Bootstrap.getPropertyAsBoolean("net.argius.stew.print-disconnected-time")) {
                     outputMessage("i.now", System.currentTimeMillis());
                 }

diff --git a/src/net/argius/stew/ui/window/ConnectorEditDialog.java b/src/net/argius/stew/ui/window/ConnectorEditDialog.java
index 66f9ec6..a940959 100644 (file)
--- a/src/net/argius/stew/ui/window/ConnectorEditDialog.java
+++ b/src/net/argius/stew/ui/window/ConnectorEditDialog.java
@@ -44,7 +44,8 @@ final class ConnectorEditDialog extends JDialog implements AnyActionListener {
     private final JCheckBox cUsesAutoRollback;
 
     private List<ChangeListener> listenerList;
-    private File currentDirectory;
+
+    private volatile File currentDirectory;
 
     ConnectorEditDialog(JDialog owner, Connector connector) {
         // [Init Instances]

diff --git a/src/net/argius/stew/ui/window/ResultSetTableModel.java b/src/net/argius/stew/ui/window/ResultSetTableModel.java
index 7828343..b320de2 100644 (file)
--- a/src/net/argius/stew/ui/window/ResultSetTableModel.java
+++ b/src/net/argius/stew/ui/window/ResultSetTableModel.java
@@ -594,19 +594,15 @@ final class ResultSetTableModel extends DefaultTableModel {
                                                String table) throws SQLException {
         ResultSet rs = dbmeta.getPrimaryKeys(catalog, schema, table);
         try {
-            Map<Short, String> result = new TreeMap<Short, String>();
+            List<String> pkList = new ArrayList<String>();
             Set<String> schemaSet = new HashSet<String>();
             while (rs.next()) {
-                result.put(rs.getShort(5), rs.getString(4));
+                pkList.add(rs.getString(4));
                 schemaSet.add(rs.getString(2));
             }
-            if (result.isEmpty() || schemaSet.size() != 1) {
+            if (schemaSet.size() != 1) {
                 return Collections.emptyList();
             }
-            List<String> pkList = new ArrayList<String>();
-            for (Short key : result.keySet()) {
-                pkList.add(result.get(key));
-            }
             return pkList;
         } finally {
             rs.close();