[Bluemusic-commits] SF.net SVN: bluemusic:[4189] blue/trunk/blue-ui-core/src

[<kun...@us...>]

Revision: 4189
          http://bluemusic.svn.sourceforge.net/bluemusic/?rev=4189&view=rev
Author:   kunstmusik
Date:     2010-03-28 02:55:38 +0000 (Sun, 28 Mar 2010)

Log Message:
-----------
fixes for generics

Modified Paths:
--------------
    blue/trunk/blue-ui-core/src/blue/components/FindReplaceDialog.java
    blue/trunk/blue-ui-core/src/blue/gui/OpcodePopup.java
    blue/trunk/blue-ui-core/src/blue/ui/core/render/APIRunner.java
    blue/trunk/blue-ui-core/src/blue/ui/core/render/ProcessConsole.java
    blue/trunk/blue-ui-core/src/org/syntax/jedit/InputHandler.java

Modified: blue/trunk/blue-ui-core/src/blue/components/FindReplaceDialog.java
===================================================================
--- blue/trunk/blue-ui-core/src/blue/components/FindReplaceDialog.java	2010-03-28 02:55:08 UTC (rev 4188)
+++ blue/trunk/blue-ui-core/src/blue/components/FindReplaceDialog.java	2010-03-28 02:55:38 UTC (rev 4189)
@@ -47,7 +47,8 @@
 
     BlueEditorPane textArea = null;
 
-    private static WeakHashMap map = new WeakHashMap();
+    private static WeakHashMap<Component, FindReplaceDialog> map =
+            new WeakHashMap<Component, FindReplaceDialog>();
 
     public static void showFindReplace(BlueEditorPane textComponent) {
         Component root = SwingUtilities.getRoot(textComponent);
@@ -65,7 +66,7 @@
             map.put(root, dialog);
         }
 
-        FindReplaceDialog findReplaceDialog = (FindReplaceDialog) map.get(root);
+        FindReplaceDialog findReplaceDialog = map.get(root);
 
         findReplaceDialog.setTextArea(textComponent);
 

Modified: blue/trunk/blue-ui-core/src/blue/gui/OpcodePopup.java
===================================================================
--- blue/trunk/blue-ui-core/src/blue/gui/OpcodePopup.java	2010-03-28 02:55:08 UTC (rev 4188)
+++ blue/trunk/blue-ui-core/src/blue/gui/OpcodePopup.java	2010-03-28 02:55:38 UTC (rev 4189)
@@ -52,7 +52,7 @@
 
     private ActionListener syntaxListener;
 
-    private static HashMap opcodeSignatures = new HashMap();
+    private static HashMap<String, String> opcodeSignatures = new HashMap<String, String>();
 
     private Action addToCodeRepository;
 
@@ -339,7 +339,7 @@
         String[] matches = new String[opcodeMatches.size()];
 
         for (int i = 0; i < matches.length; i++) {
-            matches[i] = (String) opcodeMatches.get(i);
+            matches[i] = opcodeMatches.get(i);
         }
 
         return matches;

Modified: blue/trunk/blue-ui-core/src/blue/ui/core/render/APIRunner.java
===================================================================
--- blue/trunk/blue-ui-core/src/blue/ui/core/render/APIRunner.java	2010-03-28 02:55:08 UTC (rev 4188)
+++ blue/trunk/blue-ui-core/src/blue/ui/core/render/APIRunner.java	2010-03-28 02:55:38 UTC (rev 4189)
@@ -50,7 +50,7 @@
  */
 public class APIRunner implements CSDRunner, PlayModeListener {
 
-    Vector listeners = null;
+    Vector<PlayModeListener> listeners = null;
 
     private BlueData data = null;
 
@@ -311,7 +311,7 @@
 
     public void addPlayModeListener(PlayModeListener listener) {
         if (listeners == null) {
-            listeners = new Vector();
+            listeners = new Vector<PlayModeListener>();
         }
 
         listeners.add(listener);
@@ -328,8 +328,8 @@
             return;
         }
 
-        for (Iterator iter = listeners.iterator(); iter.hasNext();) {
-            PlayModeListener listener = (PlayModeListener) iter.next();
+        for (Iterator<PlayModeListener> iter = listeners.iterator(); iter.hasNext();) {
+            PlayModeListener listener = iter.next();
             listener.playModeChanged(playMode);
         }
     }

Modified: blue/trunk/blue-ui-core/src/blue/ui/core/render/ProcessConsole.java
===================================================================
--- blue/trunk/blue-ui-core/src/blue/ui/core/render/ProcessConsole.java	2010-03-28 02:55:08 UTC (rev 4188)
+++ blue/trunk/blue-ui-core/src/blue/ui/core/render/ProcessConsole.java	2010-03-28 02:55:38 UTC (rev 4189)
@@ -200,7 +200,7 @@
         String[] retVal = new String[parts.size()];
 
         for (int i = 0; i < parts.size(); i++) {
-            retVal[i] = (String) parts.get(i);
+            retVal[i] = parts.get(i);
         }
 
         return retVal;

Modified: blue/trunk/blue-ui-core/src/org/syntax/jedit/InputHandler.java
===================================================================
--- blue/trunk/blue-ui-core/src/org/syntax/jedit/InputHandler.java	2010-03-28 02:55:08 UTC (rev 4188)
+++ blue/trunk/blue-ui-core/src/org/syntax/jedit/InputHandler.java	2010-03-28 02:55:38 UTC (rev 4189)
@@ -125,10 +125,10 @@
     // Default action
     public static final ActionListener INSERT_CHAR = new insert_char();
 
-    private static Hashtable actions;
+    private static Hashtable<String, ActionListener> actions;
 
     static {
-        actions = new Hashtable();
+        actions = new Hashtable<String, ActionListener>();
         actions.put("backspace", BACKSPACE);
         actions.put("backspace-word", BACKSPACE_WORD);
         actions.put("delete", DELETE);
@@ -177,7 +177,7 @@
      *            The action name
      */
     public static ActionListener getAction(String name) {
-        return (ActionListener) actions.get(name);
+        return actions.get(name);
     }
 
     /**
@@ -201,7 +201,7 @@
     /**
      * Returns an enumeration of all available actions.
      */
-    public static Enumeration getActions() {
+    public static Enumeration<String> getActions() {
         return actions.keys();
     }
 


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