svn commit: r1589678 - in /commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier: VerifierAppFrame.java VerifierFactoryListModel.java

[eb...@apache.org]

Author: ebourg
Date: Thu Apr 24 11:43:55 2014
New Revision: 1589678

URL: http://svn.apache.org/r1589678
Log:
Generics for the graphical verifier

Modified:
    commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java
    commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactoryListModel.java

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java?rev=1589678&r1=1589677&r2=1589678&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java Thu Apr 24 11:43:55 2014
@@ -58,7 +58,7 @@ public class VerifierAppFrame extends JF
     JPanel jPanel2 = new JPanel();
     JSplitPane jSplitPane2 = new JSplitPane();
     JPanel jPanel3 = new JPanel();
-    JList classNamesJList = new JList();
+    JList<String> classNamesJList = new JList<String>();
     GridLayout gridLayout1 = new GridLayout();
     JPanel messagesPanel = new JPanel();
     GridLayout gridLayout2 = new GridLayout();
@@ -83,8 +83,8 @@ public class VerifierAppFrame extends JF
     JScrollPane jScrollPane5 = new JScrollPane();
     JScrollPane jScrollPane6 = new JScrollPane();
     JScrollPane jScrollPane7 = new JScrollPane();
-    JList pass3aJList = new JList();
-    JList pass3bJList = new JList();
+    JList<String> pass3aJList = new JList<String>();
+    JList<String> pass3bJList = new JList<String>();
     JTextPane pass3aTextPane = new JTextPane();
     JTextPane pass3bTextPane = new JTextPane();
     JMenu jMenu2 = new JMenu();
@@ -234,7 +234,7 @@ public class VerifierAppFrame extends JF
         if (e.getValueIsAdjusting()) {
             return;
         }
-        current_class = classNamesJList.getSelectedValue().toString();
+        current_class = classNamesJList.getSelectedValue();
         try {
             verify();
         } catch (ClassNotFoundException ex) {

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactoryListModel.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactoryListModel.java?rev=1589678&r1=1589677&r2=1589678&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactoryListModel.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactoryListModel.java Thu Apr 24 11:43:55 2014
@@ -22,6 +22,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
+import javax.swing.ListModel;
 import javax.swing.event.ListDataEvent;
 import javax.swing.event.ListDataListener;
 
@@ -32,8 +33,7 @@ import javax.swing.event.ListDataListene
  * @version $Id$
  * @author Enver Haase
  */
-public class VerifierFactoryListModel implements org.apache.bcel.verifier.VerifierFactoryObserver,
-        javax.swing.ListModel {
+public class VerifierFactoryListModel implements VerifierFactoryObserver, ListModel<String> {
 
     private List<ListDataListener> listeners = new ArrayList<ListDataListener>();
     private Set<String> cache = new TreeSet<String>();
@@ -65,7 +65,7 @@ public class VerifierFactoryListModel im
     }
 
 
-    public synchronized void removeListDataListener( javax.swing.event.ListDataListener l ) {
+    public synchronized void removeListDataListener( ListDataListener l ) {
         listeners.remove(l);
     }