svn commit: r804681 - /jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/DirectoryPanel.java

[sebb]

Author: sebb
Date: Sun Aug 16 12:40:23 2009
New Revision: 804681

URL: http://svn.apache.org/viewvc?rev=804681&view=rev
Log:
Tidy up

Modified:
    
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/DirectoryPanel.java

Modified: 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/DirectoryPanel.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/DirectoryPanel.java?rev=804681&r1=804680&r2=804681&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/DirectoryPanel.java 
(original)
+++ 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/DirectoryPanel.java 
Sun Aug 16 12:40:23 2009
@@ -36,48 +36,48 @@
 import org.apache.jmeter.util.JMeterUtils;
 
 public class DirectoryPanel extends HorizontalPanel implements ActionListener {
-    protected JTextField filename = new JTextField(20);
 
-    protected JButton browse = new JButton(JMeterUtils.getResString("browse"));
+    private static final String ACTION_BROWSE = "browse"; // $NON-NSL-1$
 
-    List listeners = new LinkedList();
+    private final JTextField filename = new JTextField(20);
 
-    String title;
+    private final JButton browse = new 
JButton(JMeterUtils.getResString("browse"));
 
-    String filetype;
+    private final List<ChangeListener> listeners = new 
LinkedList<ChangeListener>();
 
-    Color background;
+    private final String title;
+
+//    private final String filetype; // NOT USED
+
+    private final Color background;
 
     /**
      * Constructor for the FilePanel object.
      */
     public DirectoryPanel() {
-        title = "";
-        init();
+        this("", null, null);
     }
 
     public DirectoryPanel(String title) {
-        this.title = title;
-        init();
+        this(title, null, null);
     }
 
     public DirectoryPanel(String title, String filetype, Color bk) {
-        this(title,filetype);
+        this.title = title;
+//        this.filetype = filetype;
         this.background = bk;
         init();
     }
 
     public DirectoryPanel(String title, String filetype) {
-        this(title);
-        this.filetype = filetype;
+        this(title, filetype, null);
     }
 
     /**
      * Constructor for the FilePanel object.
      */
     public DirectoryPanel(ChangeListener l, String title) {
-        this.title = title;
-        init();
+        this(title);
         listeners.add(l);
     }
 
@@ -93,7 +93,7 @@
         add(Box.createHorizontalStrut(5));
         filename.addActionListener(this);
         add(browse);
-        browse.setActionCommand("browse");
+        browse.setActionCommand(ACTION_BROWSE);
         browse.addActionListener(this);
     }
 
@@ -127,14 +127,14 @@
     }
 
     private void fireFileChanged() {
-        Iterator iter = listeners.iterator();
+        Iterator<ChangeListener> iter = listeners.iterator();
         while (iter.hasNext()) {
-            ((ChangeListener) iter.next()).stateChanged(new ChangeEvent(this));
+            iter.next().stateChanged(new ChangeEvent(this));
         }
     }
 
     public void actionPerformed(ActionEvent e) {
-        if (e.getActionCommand().equals("browse")) {
+        if (e.getActionCommand().equals(ACTION_BROWSE)) {
             JFileChooser chooser = DirectoryDialoger.promptToOpenFile();
             if (chooser.getSelectedFile() != null) {
                 filename.setText(chooser.getSelectedFile().getPath());



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org