More Galileo hygiene.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@2639 6335cc39-0255-0410-8fd6-9bcaacd3b74c

src/java/com/samskivert/jdbc/HsqldbLiaison.java

@@ -155,7 +155,7 @@ public class HsqldbLiaison extends BaseLiaison
             } else {
                 newDefinitions[ii] = def;
             }
-        };
+        }
 
         // now call the real implementation with our modified data
         return super.createTableIfMissing(

src/java/com/samskivert/jdbc/JDBCUtil.java

@@ -53,7 +53,7 @@ public class JDBCUtil
          */
         public void process (ResultSet row)
             throws SQLException;
-    };
+    }
 
     /**
      * Closes the supplied JDBC statement and gracefully handles being passed null (by doing

src/java/com/samskivert/swing/RadialMenuItem.java

@@ -34,20 +34,18 @@ public class RadialMenuItem extends RadialLabelSausage
     /** The command to issue if this item is selected. */
     public String command;
 
-    /** A special argument to be used when this menu item is selected,
+    /** A special argument to be used when this menu item is selected, rather than the argument
-     * rather than the argument provided to the radial menu when it was
+     * provided to the radial menu when it was activated. */
-     * activated. */
     public Object argument;
 
-    /** Used to determine whether or not this menu item should be included
+    /** Used to determine whether or not this menu item should be included in a menu and whether or
-     * in a menu and whether or not it should be enabled. If no predicate
+     * not it should be enabled. If no predicate is available, a menu item is assumed always to be
-     * is available, a menu item is assumed always to be included and
+     * included and enabled. */
-     * enabled. */
     public RadialMenu.Predicate predicate;
 
     /**
-     * Constructs a radial menu item with the specified command and label.
+     * Constructs a radial menu item with the specified command and label.  No icon or menu
-     * No icon or menu predicate will be used.
+     * predicate will be used.
      */
     public RadialMenuItem (String command, String label)
     {
@@ -55,8 +53,8 @@ public class RadialMenuItem extends RadialLabelSausage
     }
 
     /**
-     * Constructs a radial menu item with the specified command, label and
+     * Constructs a radial menu item with the specified command, label and icon. No menu predicate
-     * icon. No menu predicate will be used.
+     * will be used.
      */
     public RadialMenuItem (String command, String label, Icon icon)
     {
@@ -64,8 +62,7 @@ public class RadialMenuItem extends RadialLabelSausage
     }
 
     /**
-     * Constructs a radial menu item with the specified command, label and
+     * Constructs a radial menu item with the specified command, label and icon.
-     * icon.
      */
     public RadialMenuItem (String command, String label, Icon icon,
                            RadialMenu.Predicate predicate)
@@ -79,9 +76,8 @@ public class RadialMenuItem extends RadialLabelSausage
     }
 
     /**
-     * Returns true if this menu item should be included in a menu when it
+     * Returns true if this menu item should be included in a menu when it is displayed. Calls
-     * is displayed. Calls through to the {@link RadialMenu.Predicate} if
+     * through to the {@link RadialMenu.Predicate} if we have one.
-     * we have one.
      */
     public boolean isIncluded (RadialMenu menu)
     {
@@ -89,9 +85,16 @@ public class RadialMenuItem extends RadialLabelSausage
     }
 
     /**
-     * Returns true if this menu item should be enabled when it is
+     * Renders this menu item at the specified location.
-     * displayed. Calls through to the {@link RadialMenu.Predicate} if we
+     */
-     * have one.
+    public void render (Component host, RadialMenu menu, Graphics2D gfx, int x, int y)
+    {
+        paint(gfx, x, y, menu);
+    }
+
+    /**
+     * Returns true if this menu item should be enabled when it is displayed. Calls through to the
+     * {@link RadialMenu.Predicate} if we have one.
      */
     @Override
     public boolean isEnabled (RadialMenu menu)
@@ -100,9 +103,8 @@ public class RadialMenuItem extends RadialLabelSausage
     }
 
     /**
-     * Menu items are equal if their commands are equal. We also
+     * Menu items are equal if their commands are equal. We also declare ourselves to be equal to a
-     * declare ourselves to be equal to a string with the same value
+     * string with the same value as our command.
-     * as our command.
      */
     @Override
     public boolean equals (Object other)
@@ -116,12 +118,10 @@ public class RadialMenuItem extends RadialLabelSausage
         }
     }
 
-    /**
+    @Override
-     * Renders this menu item at the specified location.
+    public int hashCode ()
-     */
-    public void render (Component host, RadialMenu menu, Graphics2D gfx, int x, int y)
     {
-        paint(gfx, x, y, menu);
+        return command.hashCode();
     }
 
     @Override

src/java/com/samskivert/swing/RuntimeAdjust.java

@@ -506,6 +506,12 @@ public class RuntimeAdjust
             return _name.equals(((Adjust)other)._name);
         }
 
+        @Override public int hashCode ()
+        {
+            return _name.hashCode();
+        }
+
+        // from Comparable<Adjust>
         public int compareTo (Adjust other)
         {
             return _name.compareTo(other._name);

src/java/com/samskivert/util/Lifecycle.java

@@ -52,7 +52,7 @@ public class Lifecycle
     }
 
     /** Constraints for use with {@link #addInitConstraint} and {@link #addShutdownConstraint}. */
-    public static enum Constraint { RUNS_BEFORE, RUNS_AFTER };
+    public static enum Constraint { RUNS_BEFORE, RUNS_AFTER }
 
     /**
      * Registers a component with the lifecycle. This should be done during dependency resolution

src/java/com/samskivert/util/ResultListener.java

@@ -60,7 +60,7 @@ public interface ResultListener<T>
         }
         public void requestFailed (Exception cause) {
         }
-    };
+    }
 
     /**
      * Called to communicate that the request succeeded and that the

src/java/com/samskivert/util/SignalUtil.java

@@ -75,7 +75,7 @@ public class SignalUtil
         }
 
         protected int _signo;
-    };
+    }
 
     public static interface Handler {
         public void signalReceived (Number number);