mstover1 02/05/16 18:29:35
Modified: src_1/org/apache/jmeter NewDriver.java
src_1/org/apache/jmeter/gui GuiPackage.java MainFrame.java
src_1/org/apache/jmeter/gui/action ExitCommand.java
Load.java Save.java Start.java
src_1/org/apache/jmeter/protocol/ftp/sampler FTPSampler.java
src_1/org/apache/jmeter/protocol/http/proxy
HttpRequestHdr.java
src_1/org/apache/jmeter/protocol/http/sampler
HTTPSampler.java HTTPSamplerFull.java
src_1/org/apache/jmeter/reporters ResultCollector.java
src_1/org/apache/jmeter/resources messages.properties
messages_ja.properties messages_no.properties
src_1/org/apache/jmeter/samplers SampleResult.java
src_1/org/apache/jmeter/testelement AbstractTestElement.java
src_1/org/apache/jmeter/threads/gui ThreadGroupGui.java
src_1/org/apache/jmeter/util ListedHashTree.java
src_1/org/apache/jmeter/visualizers
ViewResultsFullVisualizer.java
Added: src_1/org/apache/jmeter/gui/action AbstractAction.java
CheckDirty.java
Log:
Adding dirty check before program exit
Revision Changes Path
1.3 +4 -0 jakarta-jmeter/src_1/org/apache/jmeter/NewDriver.java
Index: NewDriver.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/NewDriver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NewDriver.java 29 Apr 2002 17:08:06 -0000 1.2
+++ NewDriver.java 17 May 2002 01:29:34 -0000 1.3
@@ -55,9 +55,11 @@
package org.apache.jmeter;
import java.io.*;
+import java.awt.event.*;
import org.apache.jmeter.gui.*;
import org.apache.jmeter.gui.action.ActionRouter;
+import org.apache.jmeter.gui.action.CheckDirty;
import org.apache.jmeter.gui.tree.*;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.gui.util.ComponentUtil;
@@ -96,5 +98,7 @@
treeLis.setActionHandler(ActionRouter.getInstance());
ComponentUtil.centerComponentInWindow(main,80);
main.show();
+ ActionRouter.getInstance().actionPerformed(new ActionEvent(
+ main,1,CheckDirty.ADD_ALL));
}
}
1.5 +11 -0 jakarta-jmeter/src_1/org/apache/jmeter/gui/GuiPackage.java
Index: GuiPackage.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/gui/GuiPackage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- GuiPackage.java 16 May 2002 16:41:29 -0000 1.4
+++ GuiPackage.java 17 May 2002 01:29:34 -0000 1.5
@@ -76,6 +76,7 @@
{
private static GuiPackage guiPack;
+ private boolean dirty = false;
private GuiPackage()
{
@@ -96,6 +97,16 @@
guiPack.setTreeModel(treeModel);
}
return guiPack;
+ }
+
+ public void setDirty(boolean d)
+ {
+ dirty = d;
+ }
+
+ public boolean isDirty()
+ {
+ return dirty;
}
public void testStarted(String host)
1.4 +2 -0 jakarta-jmeter/src_1/org/apache/jmeter/gui/MainFrame.java
Index: MainFrame.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/gui/MainFrame.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MainFrame.java 16 May 2002 16:41:29 -0000 1.3
+++ MainFrame.java 17 May 2002 01:29:34 -0000 1.4
@@ -62,11 +62,12 @@
import org.apache.jmeter.gui.util.JMeterMenuBar;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.gui.action.Start;
+import org.apache.jmeter.gui.action.CheckDirty;
/****************************************
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2002/05/16 16:41:29 $
+ *@created $Date: 2002/05/17 01:29:34 $
*@version 1.0
***************************************/
@@ -102,6 +103,7 @@
this.actionHandler = actionHandler;
this.treeModel = treeModel;
init();
+ this.setDefaultCloseOperation(this.DO_NOTHING_ON_CLOSE);
}
/****************************************
@@ -345,8 +347,8 @@
* !ToDo (Class description)
*
*@author $Author: mstover1 $
- *@created $Date: 2002/05/16 16:41:29 $
- *@version $Revision: 1.3 $
+ *@created $Date: 2002/05/17 01:29:34 $
+ *@version $Revision: 1.4 $
***************************************/
private class WindowHappenings extends WindowAdapter
{
1.3 +22 -1
jakarta-jmeter/src_1/org/apache/jmeter/gui/action/ExitCommand.java
Index: ExitCommand.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/gui/action/ExitCommand.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ExitCommand.java 29 Apr 2002 17:08:08 -0000 1.2
+++ ExitCommand.java 17 May 2002 01:29:34 -0000 1.3
@@ -57,9 +57,12 @@
import java.awt.event.ActionEvent;
import java.util.*;
import java.lang.reflect.*;
+import javax.swing.*;
import org.apache.jmeter.gui.*;
import org.apache.jmeter.gui.tree.*;
+import org.apache.jmeter.gui.util.*;
+import org.apache.jmeter.util.*;
/**
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
@@ -90,6 +93,8 @@
{
return commands;
}
+
+
/**
* Description of the Method
@@ -99,7 +104,23 @@
public void doAction(ActionEvent e)
{
System.err.println("Note to self, we should really prompt to save
here... (bb)");
- System.exit(0);
+ ActionRouter.getInstance().actionPerformed(new ActionEvent(
+ e.getSource(),e.getID(),CheckDirty.CHECK_DIRTY));
+ if(GuiPackage.getInstance().isDirty())
+ {
+
if(JOptionPane.showConfirmDialog(GuiPackage.getInstance().getMainFrame(),
+
JMeterUtils.getResString("cancel_exit_to_save"),
+ JMeterUtils.getResString("Save?"),
+ JOptionPane.YES_NO_OPTION,
+ JOptionPane.QUESTION_MESSAGE) ==
JOptionPane.NO_OPTION)
+ {
+ System.exit(0);
+ }
+ }
+ else
+ {
+ System.exit(0);
+ }
}
static
1.5 +4 -1 jakarta-jmeter/src_1/org/apache/jmeter/gui/action/Load.java
Index: Load.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/gui/action/Load.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Load.java 2 May 2002 22:54:58 -0000 1.4
+++ Load.java 17 May 2002 01:29:34 -0000 1.5
@@ -75,7 +75,7 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2002/05/02 22:54:58 $
+ *@created $Date: 2002/05/17 01:29:34 $
*@version 1.0
***************************************/
public class Load implements Command
@@ -124,6 +124,9 @@
ListedHashTree tree = SaveService.loadSubTree(reader);
convertTree(tree);
GuiPackage.getInstance().addSubTree(tree);
+ tree = GuiPackage.getInstance().getCurrentSubTree();
+ ActionRouter.getInstance().actionPerformed(new
ActionEvent(
+
tree.get(tree.getArray()[tree.size()-1]),e.getID(),CheckDirty.SUB_TREE_LOADED));
}
}
catch(IllegalUserActionException ex)
1.4 +2 -0 jakarta-jmeter/src_1/org/apache/jmeter/gui/action/Save.java
Index: Save.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/gui/action/Save.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Save.java 2 May 2002 22:54:58 -0000 1.3
+++ Save.java 17 May 2002 01:29:34 -0000 1.4
@@ -123,6 +123,8 @@
{
writer = new FileOutputStream(chooser.getSelectedFile());
SaveService.saveSubTree(subTree,writer);
+ ActionRouter.getInstance().actionPerformed(new ActionEvent(
+
e.getSource(),e.getID(),CheckDirty.SUB_TREE_SAVED));
}
catch(Throwable ex)
{
1.5 +1 -14 jakarta-jmeter/src_1/org/apache/jmeter/gui/action/Start.java
Index: Start.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/gui/action/Start.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Start.java 16 May 2002 16:41:29 -0000 1.4
+++ Start.java 17 May 2002 01:29:34 -0000 1.5
@@ -72,7 +72,7 @@
*@version 1.0
***************************************/
-public class Start implements Command
+public class Start extends AbstractAction
{
private static Set commands = new HashSet();
@@ -98,19 +98,6 @@
public Set getActionNames()
{
return commands;
- }
-
- private void convertSubTree(ListedHashTree tree)
- {
- Iterator iter = new LinkedList(tree.list()).iterator();
- while (iter.hasNext())
- {
- JMeterGUIComponent item = (JMeterGUIComponent)iter.next();
- convertSubTree(tree.get(item));
- TestElement testElement = item.createTestElement();
- tree.replace(item,testElement);
-
- }
}
1.1
jakarta-jmeter/src_1/org/apache/jmeter/gui/action/AbstractAction.java
Index: AbstractAction.java
===================================================================
package org.apache.jmeter.gui.action;
import java.awt.event.ActionEvent;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.Set;
import org.apache.jmeter.gui.JMeterGUIComponent;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.ListedHashTree;
/**
* @author mstover
*
* To change this generated comment edit the template variable "typecomment":
* Window>Preferences>Java>Templates.
*/
public abstract class AbstractAction implements Command {
/**
* @see Command#doAction(ActionEvent)
*/
public void doAction(ActionEvent e) {
}
/**
* @see Command#getActionNames()
*/
public Set getActionNames() {
return null;
}
protected void convertSubTree(ListedHashTree tree)
{
Iterator iter = new LinkedList(tree.list()).iterator();
while (iter.hasNext())
{
JMeterGUIComponent item = (JMeterGUIComponent)iter.next();
convertSubTree(tree.get(item));
TestElement testElement = item.createTestElement();
tree.replace(item,testElement);
}
}
}
1.1
jakarta-jmeter/src_1/org/apache/jmeter/gui/action/CheckDirty.java
Index: CheckDirty.java
===================================================================
package org.apache.jmeter.gui.action;
import java.awt.event.ActionEvent;
import java.util.*;
import org.apache.jmeter.util.*;
import org.apache.jmeter.gui.*;
/**
* @author mstover
*
* To change this generated comment edit the template variable "typecomment":
* Window>Preferences>Java>Templates.
*/
public class CheckDirty extends AbstractAction implements
ListedHashTreeVisitor
{
private Map previousGuiItems;
public static final String CHECK_DIRTY = "check_dirty";
public static final String SUB_TREE_SAVED = "sub_tree_saved";
public static final String SUB_TREE_LOADED = "sub_tree_loaded";
public static final String ADD_ALL = "add_all";
boolean checkMode = false;
boolean dirty = false;
private static Set commands = new HashSet();
static
{
commands.add(CHECK_DIRTY);
commands.add(SUB_TREE_SAVED);
commands.add(SUB_TREE_LOADED);
commands.add(ADD_ALL);
}
public CheckDirty()
{
previousGuiItems = new HashMap();
}
/**
* @see Command#doAction(ActionEvent)
*/
public void doAction(ActionEvent e) {
String action = e.getActionCommand();
if(action.equals(SUB_TREE_SAVED))
{
ListedHashTree subTree =
GuiPackage.getInstance().getCurrentSubTree();
subTree.traverse(this);
}
else if(action.equals(SUB_TREE_LOADED))
{
ListedHashTree addTree = (ListedHashTree)e.getSource();
addTree.traverse(this);
}
else if(action.equals(ADD_ALL))
{
GuiPackage.getInstance().getTreeModel().getTestPlan().traverse(this);
}
else if(action.equals(CHECK_DIRTY))
{
checkMode = true;
dirty = false;
ListedHashTree wholeTree =
GuiPackage.getInstance().getTreeModel().getTestPlan();
wholeTree.traverse(this);
GuiPackage.getInstance().setDirty(dirty);
checkMode = false;
}
}
/**
* The tree traverses itself depth-first, calling processNode for each object
* it encounters as it goes.
*/
public void addNode(Object node,ListedHashTree subTree)
{
JMeterGUIComponent treeNode = (JMeterGUIComponent)node;
if(checkMode)
{
if(previousGuiItems.containsKey(treeNode))
{
if(!previousGuiItems.get(treeNode).equals(
treeNode.createTestElement()))
{
dirty = true;
}
}
else
{
dirty = true;
}
}
else
{
previousGuiItems.put(treeNode,treeNode.createTestElement());
}
}
/**
* Indicates traversal has moved up a step, and the visitor should remove the
* top node from it's stack structure.
*/
public void subtractNode()
{
}
/**
* Process path is called when a leaf is reached. If a visitor wishes to
generate
* Lists of path elements to each leaf, it should keep a Stack data structure
of
* nodes passed to it with addNode, and removing top items for every
subtractNode()
* call.
*/
public void processPath()
{
}
/**
* @see Command#getActionNames()
*/
public Set getActionNames() {
return commands;
}
}
1.6 +0 -0
jakarta-jmeter/src_1/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
Index: FTPSampler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FTPSampler.java 16 May 2002 16:41:29 -0000 1.5
+++ FTPSampler.java 17 May 2002 01:29:34 -0000 1.6
@@ -68,8 +68,8 @@
* A sampler which understands FTP file requests
*
*@author $Author: mstover1 $
- *@created $Date: 2002/05/16 16:41:29 $
- *@version $Revision: 1.5 $
+ *@created $Date: 2002/05/17 01:29:34 $
+ *@version $Revision: 1.6 $
***********************************************************/
public class FTPSampler extends AbstractSampler
1.10 +10 -3
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
Index: HttpRequestHdr.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- HttpRequestHdr.java 13 May 2002 12:19:14 -0000 1.9
+++ HttpRequestHdr.java 17 May 2002 01:29:35 -0000 1.10
@@ -26,8 +26,8 @@
* !ToDo (Class description)
*
*@author $Author: mstover1 $
- *@created $Date: 2002/05/13 12:19:14 $
- *@version $Revision: 1.9 $
+ *@created $Date: 2002/05/17 01:29:35 $
+ *@version $Revision: 1.10 $
***************************************/
public class HttpRequestHdr
{
@@ -175,7 +175,14 @@
urlConfig.setMethod(method);
urlConfig.setPath(serverUrl());
urlConfig.setName(urlConfig.getPath());
- urlConfig.setProtocol(url.substring(0, url.indexOf(":")));
+ if(url.indexOf(":") > -1)
+ {
+ urlConfig.setProtocol(url.substring(0, url.indexOf(":")));
+ }
+ else
+ {
+ urlConfig.setProtocol("http");
+ }
urlConfig.setPort(serverPort());
urlConfig.parseArguments(postData);
return urlConfig;
1.9 +1 -0
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
Index: HTTPSampler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- HTTPSampler.java 16 May 2002 16:41:30 -0000 1.8
+++ HTTPSampler.java 17 May 2002 01:29:35 -0000 1.9
@@ -80,8 +80,8 @@
* HTTP requests, including cookies and authentication.
*
*@author Michael Stover
- *@created $Date: 2002/05/16 16:41:30 $
- *@version $Revision: 1.8 $
+ *@created $Date: 2002/05/17 01:29:35 $
+ *@version $Revision: 1.9 $
***************************************/
public class HTTPSampler extends AbstractSampler
{
@@ -620,6 +620,7 @@
}
URL newUrl = new URL(loc);
urlConfig.setDomain(newUrl.getHost());
+ System.out.println("redirected file = "+newUrl.getFile());
urlConfig.setPath(newUrl.getFile());
urlConfig.setArguments(new Arguments());
urlConfig.setMethod(HTTPSampler.GET);
1.8 +0 -0
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFull.java
Index: HTTPSamplerFull.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFull.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- HTTPSamplerFull.java 16 May 2002 16:41:30 -0000 1.7
+++ HTTPSamplerFull.java 17 May 2002 01:29:35 -0000 1.8
@@ -82,7 +82,7 @@
*
* @author Khor Soon Hin
* @version 1.0
- * @created $Date: 2002/05/16 16:41:30 $
+ * @created $Date: 2002/05/17 01:29:35 $
*/
public class HTTPSamplerFull extends HTTPSampler
{
1.11 +0 -0
jakarta-jmeter/src_1/org/apache/jmeter/reporters/ResultCollector.java
Index: ResultCollector.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/reporters/ResultCollector.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ResultCollector.java 16 May 2002 16:41:30 -0000 1.10
+++ ResultCollector.java 17 May 2002 01:29:35 -0000 1.11
@@ -71,7 +71,7 @@
* Title: Description: Copyright: Copyright (c) 2001 Company:
*
*@author Michael Stover
- *@created $Date: 2002/05/16 16:41:30 $
+ *@created $Date: 2002/05/17 01:29:35 $
*@version 1.0
*/
1.8 +3 -1
jakarta-jmeter/src_1/org/apache/jmeter/resources/messages.properties
Index: messages.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/resources/messages.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- messages.properties 1 May 2002 23:48:52 -0000 1.7
+++ messages.properties 17 May 2002 01:29:35 -0000 1.8
@@ -214,4 +214,6 @@
busy_testing=I'm busy testing, please stop the test before changing settings
http_user_parameter_modifier=HTTP User Parameter Modifier
user_param_mod_help_note=(Do not change this. Instead, modify the file of that
name in JMeter's /bin directory)
-filename=File Name
\ No newline at end of file
+filename=File Name
+cancel_exit_to_save=There are test items that have not been saved. Do you wish to
save before exiting?
+save?=Save?
\ No newline at end of file
1.7 +3 -1
jakarta-jmeter/src_1/org/apache/jmeter/resources/messages_ja.properties
Index: messages_ja.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/resources/messages_ja.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- messages_ja.properties 1 May 2002 23:48:52 -0000 1.6
+++ messages_ja.properties 17 May 2002 01:29:35 -0000 1.7
@@ -208,4 +208,6 @@
busy_testing=I'm busy testing, please stop the test before changing settings
http_user_parameter_modifier=HTTP User Parameter Modifier
user_param_mod_help_note=(Do not change this. Instead, modify the file of that
name in JMeter's /bin directory)
-filename=File Name
\ No newline at end of file
+filename=File Name
+cancel_exit_to_save=There are test items that have not been saved. Do you wish to
save before exiting?
+save?=Save?
\ No newline at end of file
1.7 +3 -1
jakarta-jmeter/src_1/org/apache/jmeter/resources/messages_no.properties
Index: messages_no.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/resources/messages_no.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- messages_no.properties 1 May 2002 23:48:52 -0000 1.6
+++ messages_no.properties 17 May 2002 01:29:35 -0000 1.7
@@ -199,4 +199,6 @@
busy_testing=I'm busy testing, please stop the test before changing settings
http_user_parameter_modifier=HTTP User Parameter Modifier
user_param_mod_help_note=(Do not change this. Instead, modify the file of that
name in JMeter's /bin directory)
-filename=File Name
\ No newline at end of file
+filename=File Name
+cancel_exit_to_save=There are test items that have not been saved. Do you wish to
save before exiting?
+save?=Save?
\ No newline at end of file
1.9 +0 -0
jakarta-jmeter/src_1/org/apache/jmeter/samplers/SampleResult.java
Index: SampleResult.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/samplers/SampleResult.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SampleResult.java 16 May 2002 16:41:30 -0000 1.8
+++ SampleResult.java 17 May 2002 01:29:35 -0000 1.9
@@ -67,8 +67,8 @@
* sample of an entry.
*
*@author $Author: mstover1 $
- *@created $Date: 2002/05/16 16:41:30 $
- *@version $Revision: 1.8 $
+ *@created $Date: 2002/05/17 01:29:35 $
+ *@version $Revision: 1.9 $
*/
public class SampleResult implements Serializable
{
1.6 +14 -1
jakarta-jmeter/src_1/org/apache/jmeter/testelement/AbstractTestElement.java
Index: AbstractTestElement.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/testelement/AbstractTestElement.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractTestElement.java 2 May 2002 22:55:00 -0000 1.5
+++ AbstractTestElement.java 17 May 2002 01:29:35 -0000 1.6
@@ -6,7 +6,7 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2002/05/02 22:55:00 $
+ *@created $Date: 2002/05/17 01:29:35 $
*@version 1.0
***************************************/
@@ -38,6 +38,19 @@
public void removeProperty(String key)
{
testInfo.remove(key);
+ }
+
+ public boolean equals(Object o)
+ {
+ if(o instanceof AbstractTestElement)
+ {
+ System.out.println("is equal?
"+((AbstractTestElement)o).testInfo.equals(testInfo));
+ return ((AbstractTestElement)o).testInfo.equals(testInfo);
+ }
+ else
+ {
+ return false;
+ }
}
/****************************************
1.7 +0 -0
jakarta-jmeter/src_1/org/apache/jmeter/threads/gui/ThreadGroupGui.java
Index: ThreadGroupGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/threads/gui/ThreadGroupGui.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ThreadGroupGui.java 16 May 2002 16:41:30 -0000 1.6
+++ ThreadGroupGui.java 17 May 2002 01:29:35 -0000 1.7
@@ -75,7 +75,7 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2002/05/16 16:41:30 $
+ *@created $Date: 2002/05/17 01:29:35 $
*@version 1.0
***************************************/
1.4 +13 -5 jakarta-jmeter/src_1/org/apache/jmeter/util/ListedHashTree.java
Index: ListedHashTree.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/util/ListedHashTree.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ListedHashTree.java 29 Apr 2002 17:08:14 -0000 1.3
+++ ListedHashTree.java 17 May 2002 01:29:35 -0000 1.4
@@ -66,10 +66,10 @@
* function).
*
*@author $Author: mstover1 $
- *@created $Date: 2002/04/29 17:08:14 $
- *@version $Revision: 1.3 $
+ *@created $Date: 2002/05/17 01:29:35 $
+ *@version $Revision: 1.4 $
***************************************/
-public class ListedHashTree implements Serializable
+public class ListedHashTree implements Serializable,Cloneable
{
private static Category log = Category.getInstance(ListedHashTree.class);
@@ -84,6 +84,14 @@
data = new HashMap();
order = new LinkedList();
}
+
+ public Object clone()
+ {
+ ListedHashTree newTree = new ListedHashTree();
+ newTree.data = (Map)((HashMap)data).clone();
+ newTree.order = (List)((LinkedList)order).clone();
+ return newTree;
+ }
/****************************************
* !ToDo (Constructor description)
@@ -1168,8 +1176,8 @@
* !ToDo (Class description)
*
*@author $Author: mstover1 $
- *@created $Date: 2002/04/29 17:08:14 $
- *@version $Revision: 1.3 $
+ *@created $Date: 2002/05/17 01:29:35 $
+ *@version $Revision: 1.4 $
***************************************/
public static class Test extends junit.framework.TestCase
{
1.9 +0 -0
jakarta-jmeter/src_1/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
Index: ViewResultsFullVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ViewResultsFullVisualizer.java 16 May 2002 16:41:30 -0000 1.8
+++ ViewResultsFullVisualizer.java 17 May 2002 01:29:35 -0000 1.9
@@ -80,7 +80,7 @@
*
*@author Khor Soon Hin
*@created 2001/07/25
- *@version $Revision: 1.8 $ $Date: 2002/05/16 16:41:30 $
+ *@version $Revision: 1.9 $ $Date: 2002/05/17 01:29:35 $
***************************************/
public class ViewResultsFullVisualizer extends ViewResultsVisualizer implements
TreeSelectionListener
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
