sebb 2003/10/19 15:26:08
Modified: src/core/org/apache/jmeter/gui/tree JMeterTreeListener.java
JMeterTreeNode.java
src/core/org/apache/jmeter/gui/action AbstractAction.java
AddToTree.java Load.java New.java ExitCommand.java
Start.java Save.java
src/core/org/apache/jmeter/gui/util FilePanel.java
FileDialoger.java PowerTableModel.java
JMeterMenuBar.java
src/core/org/apache/jmeter/gui NamePanel.java
Log:
Make fields private; log final; fix Boolean usage; Javadoc tags
Revision Changes Path
1.13 +7 -7
jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java
Index: JMeterTreeListener.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JMeterTreeListener.java 17 Oct 2003 15:14:44 -0000 1.12
+++ JMeterTreeListener.java 19 Oct 2003 22:26:07 -0000 1.13
@@ -84,18 +84,18 @@
/**
* @author Michael Stover
- * @created March 11, 2001
- * @version $Revision$
+ * Created March 11, 2001
+ * @version $Revision$ Last updated: $Date$
*/
public class JMeterTreeListener
implements TreeSelectionListener, MouseListener, KeyListener,
MouseMotionListener
{
transient private static Logger log = LoggingManager.getLoggerForClass();
- Container endWindow;
- JPopupMenu pop;
- TreePath currentPath;
- ActionListener actionHandler;
+ //Container endWindow;
+ //JPopupMenu pop;
+ private TreePath currentPath;
+ private ActionListener actionHandler;
private JMeterTreeModel model;
private JTree tree;
@@ -151,7 +151,7 @@
*/
public void setEndWindow(Container window)
{
- endWindow = window;
+ //endWindow = window;
}
/**
1.14 +3 -3
jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
Index: JMeterTreeNode.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JMeterTreeNode.java 7 Sep 2003 18:54:53 -0000 1.13
+++ JMeterTreeNode.java 19 Oct 2003 22:26:07 -0000 1.14
@@ -79,8 +79,8 @@
implements JMeterGUIComponent
{
transient private static Logger log = LoggingManager.getLoggerForClass();
- JMeterTreeModel treeModel;
- boolean enabled = true;
+ private JMeterTreeModel treeModel;
+ //boolean enabled = true;
public JMeterTreeNode(TestElement userObj, JMeterTreeModel treeModel)
{
1.10 +2 -2
jakarta-jmeter/src/core/org/apache/jmeter/gui/action/AbstractAction.java
Index: AbstractAction.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/AbstractAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AbstractAction.java 27 Jun 2003 19:12:54 -0000 1.9
+++ AbstractAction.java 19 Oct 2003 22:26:08 -0000 1.10
@@ -18,7 +18,7 @@
*/
public abstract class AbstractAction implements Command
{
- protected static Logger log = LoggingManager.getLoggerForClass();
+ protected static final Logger log = LoggingManager.getLoggerForClass();
/**
* @see Command#doAction(ActionEvent)
1.10 +2 -2
jakarta-jmeter/src/core/org/apache/jmeter/gui/action/AddToTree.java
Index: AddToTree.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/AddToTree.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AddToTree.java 5 Oct 2003 01:05:31 -0000 1.9
+++ AddToTree.java 19 Oct 2003 22:26:08 -0000 1.10
@@ -69,8 +69,8 @@
import org.apache.log.Logger;
/**
- * @author $Author$
- * @version $Revision$
+ * @author
+ * @version $Revision$ Last updated: $Date$
*/
public class AddToTree implements Command
{
1.19 +6 -6 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Load.java
Index: Load.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Load.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Load.java 27 Jun 2003 19:12:54 -0000 1.18
+++ Load.java 19 Oct 2003 22:26:08 -0000 1.19
@@ -210,8 +210,8 @@
}
/**
- * @author $Author$
- * @version $Revision$
+ *
+ * @version $Revision$ Last updated: $Date$
*/
public static class Test extends TestCase
{
@@ -237,11 +237,11 @@
public void setUp()
{
- testFile1 =
+ testFile1 = //TODO: not used - why?
new File(
System.getProperty("user.dir") + "/testfiles",
"Test Plan.jmx");
- testFile2 =
+ testFile2 = //TODO: not used - why?
new File(
System.getProperty("user.dir") + "/testfiles",
"Modification Manager.jmx");
@@ -285,7 +285,7 @@
new File(
System.getProperty("user.dir") + "/testfiles",
"SimpleTestPlan.jmx");
- testFile13 =
+ testFile13 = //TODO: not used - why?
new File(
System.getProperty("user.dir") + "/testfiles",
"URLRewritingExample.jmx");
1.8 +2 -2 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/New.java
Index: New.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/New.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- New.java 5 Oct 2003 14:27:49 -0000 1.7
+++ New.java 19 Oct 2003 22:26:08 -0000 1.8
@@ -68,8 +68,8 @@
* test plan.
*
* @author <a href="[EMAIL PROTECTED]">Martin Ramshaw</a>
- * @created June 6, 2002
- * @version $Revision$
+ * Created June 6, 2002
+ * @version $Revision$ Last updated: $Date$
*/
public class New implements Command
{
1.9 +2 -2
jakarta-jmeter/src/core/org/apache/jmeter/gui/action/ExitCommand.java
Index: ExitCommand.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/ExitCommand.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ExitCommand.java 5 Oct 2003 14:27:49 -0000 1.8
+++ ExitCommand.java 19 Oct 2003 22:26:08 -0000 1.9
@@ -65,8 +65,8 @@
/**
* @author Brendan Burns
- * @created October 5, 2001
- * @version $Revision$
+ * Created October 5, 2001
+ * @version $Revision$ Last updated: $Date$
*/
public class ExitCommand implements Command
{
1.12 +2 -2 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Start.java
Index: Start.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Start.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Start.java 5 Oct 2003 15:07:05 -0000 1.11
+++ Start.java 19 Oct 2003 22:26:08 -0000 1.12
@@ -74,8 +74,8 @@
/**
* @author Michael Stover
- * @created March 1, 2001
- * @version $Revision$
+ * Created March 1, 2001
+ * @version $Revision$ Last updated: $Date$
*/
public class Start extends AbstractAction
{
1.17 +2 -2 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Save.java
Index: Save.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Save.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Save.java 7 Sep 2003 18:54:53 -0000 1.16
+++ Save.java 19 Oct 2003 22:26:08 -0000 1.17
@@ -78,8 +78,8 @@
/**
* @author Michael Stover
- * @created February 13, 2001
- * @version $Revision$
+ * Created February 13, 2001
+ * @version $Revision$ Last updated: $Date$
*/
public class Save implements Command
{
1.10 +2 -2
jakarta-jmeter/src/core/org/apache/jmeter/gui/util/FilePanel.java
Index: FilePanel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/util/FilePanel.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FilePanel.java 27 Jun 2003 20:37:40 -0000 1.9
+++ FilePanel.java 19 Oct 2003 22:26:08 -0000 1.10
@@ -73,8 +73,8 @@
/**
* @author Michael Stover
- * @created April 18, 2002
- * @version $Revision$
+ * Created April 18, 2002
+ * @version $Revision$ Last updated: $Date$
*/
public class FilePanel extends HorizontalPanel implements ActionListener
{
1.6 +3 -3
jakarta-jmeter/src/core/org/apache/jmeter/gui/util/FileDialoger.java
Index: FileDialoger.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/util/FileDialoger.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FileDialoger.java 18 Aug 2003 19:40:42 -0000 1.5
+++ FileDialoger.java 19 Oct 2003 22:26:08 -0000 1.6
@@ -72,8 +72,8 @@
/**
* The last directory visited by the user while choosing Files.
*/
- public static String lastJFCDirectory = null;
- public static JFileChooser jfc = new JFileChooser();
+ public static String lastJFCDirectory = null;//TODO: make private?
+ public static JFileChooser jfc = new JFileChooser();//TODO: make private?
/**
* Prevent instantiation of utility class.
1.9 +2 -2
jakarta-jmeter/src/core/org/apache/jmeter/gui/util/PowerTableModel.java
Index: PowerTableModel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/util/PowerTableModel.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PowerTableModel.java 27 Jun 2003 20:37:40 -0000 1.8
+++ PowerTableModel.java 19 Oct 2003 22:26:08 -0000 1.9
@@ -163,7 +163,7 @@
{
Constructor constr =
colClass.getConstructor(new Class[] { Boolean.TYPE });
- return constr.newInstance(new Object[] { new Boolean(false)});
+ return constr.newInstance(new Object[] { Boolean.FALSE});
}
catch (Exception err)
{
1.18 +4 -4
jakarta-jmeter/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
Index: JMeterMenuBar.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JMeterMenuBar.java 10 Oct 2003 16:21:55 -0000 1.17
+++ JMeterMenuBar.java 19 Oct 2003 22:26:08 -0000 1.18
@@ -91,7 +91,7 @@
JMenuItem file_new;
JMenu editMenu;
JMenu edit_add;
- JMenu edit_add_submenu;
+ //JMenu edit_add_submenu;
JMenuItem edit_remove;
JMenu runMenu;
JMenuItem run_start;
@@ -105,8 +105,8 @@
Collection remote_engine_stop;
JMenuItem run_clear;
JMenuItem run_clearAll;
- JMenu reportMenu;
- JMenuItem analyze;
+ //JMenu reportMenu;
+ //JMenuItem analyze;
JMenu optionsMenu;
JMenu lafMenu;
JMenuItem sslManager;
1.12 +2 -3 jakarta-jmeter/src/core/org/apache/jmeter/gui/NamePanel.java
Index: NamePanel.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/NamePanel.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- NamePanel.java 29 May 2003 13:33:56 -0000 1.11
+++ NamePanel.java 19 Oct 2003 22:26:08 -0000 1.12
@@ -70,11 +70,10 @@
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.util.LocaleChangeEvent;
/****************************************
- * Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
+ * Title: JMeter
*
[EMAIL PROTECTED] Michael Stover
- [EMAIL PROTECTED] $Date$
- [EMAIL PROTECTED] 1.0
+ [EMAIL PROTECTED] $Revision$ Last updated: $Date$
***************************************/
public class NamePanel extends JPanel implements JMeterGUIComponent
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
