mstover1 2004/02/11 18:58:26
Modified: src/core/org/apache/jmeter/gui GuiPackage.java
src/core/org/apache/jmeter/gui/tree JMeterTreeModel.java
src/core/org/apache/jmeter/util JMeterVersion.java
src/protocol/http/org/apache/jmeter/protocol/http/proxy
Daemon.java
src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui
ProxyControlGui.java
Log:
Fixing problem in proxy - refreshing model when start button clicked to get latest
user changes to values. Also fixed problem where currently selected elements are
overwritten by proxy recorded items
Revision Changes Path
1.28 +6 -1 jakarta-jmeter/src/core/org/apache/jmeter/gui/GuiPackage.java
Index: GuiPackage.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/GuiPackage.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- GuiPackage.java 10 Feb 2004 22:05:38 -0000 1.27
+++ GuiPackage.java 12 Feb 2004 02:58:25 -0000 1.28
@@ -464,6 +464,11 @@
log.error("Problem retrieving gui", e);
}
}
+
+ public TestElement getCurrentElement()
+ {
+ return treeListener.getCurrentNode().createTestElement();
+ }
/**
* The dirty property is a flag that indicates whether there are parts of
1.23 +8 -5
jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java
Index: JMeterTreeModel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- JMeterTreeModel.java 12 Feb 2004 01:41:58 -0000 1.22
+++ JMeterTreeModel.java 12 Feb 2004 02:58:25 -0000 1.23
@@ -65,6 +65,8 @@
import org.apache.jmeter.control.gui.TestPlanGui;
import org.apache.jmeter.control.gui.WorkBenchGui;
import org.apache.jmeter.exceptions.IllegalUserActionException;
+import org.apache.jmeter.gui.GuiPackage;
+import org.apache.jmeter.gui.JMeterGUIComponent;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.TestPlan;
import org.apache.jmeter.testelement.WorkBench;
@@ -163,10 +165,11 @@
TestElement.GUI_CLASS,
NameUpdater.getCurrentName(
component.getPropertyAsString(TestElement.GUI_CLASS)));
-// Commenting these three lines fixed bug#24704 and bug#25166. TODO: remove them.
-// JMeterGUIComponent guicomp = GuiPackage.getInstance().getGui(component);
-// guicomp.configure(component);
-// guicomp.modifyTestElement(component);
+ GuiPackage.getInstance().updateCurrentNode();
+ JMeterGUIComponent guicomp = GuiPackage.getInstance().getGui(component);
+ guicomp.configure(component);
+ guicomp.modifyTestElement(component);
+ GuiPackage.getInstance().getCurrentGui(); //put the gui object back to the
way it was.
JMeterTreeNode newNode =
new JMeterTreeNode((TestElement) component, this);
1.10 +2 -2
jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterVersion.java
Index: JMeterVersion.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterVersion.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JMeterVersion.java 30 Jan 2004 16:05:38 -0000 1.9
+++ JMeterVersion.java 12 Feb 2004 02:58:25 -0000 1.10
@@ -24,7 +24,7 @@
* pattern: VERSION = <quote>.*<quote>
*
*/
- static final String VERSION = "1.9.20040130";
+ static final String VERSION = "1.9.20040211";
private JMeterVersion() // Not instantiable
{
1.11 +3 -4
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Daemon.java
Index: Daemon.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Daemon.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Daemon.java 12 Feb 2004 00:29:50 -0000 1.10
+++ Daemon.java 12 Feb 2004 02:58:25 -0000 1.11
@@ -171,10 +171,9 @@
try
{
- log.info("Creating Daemon Socket...");
+ log.info("Creating Daemon Socket... on port " + daemonPort);
mainSocket = new ServerSocket(daemonPort);
mainSocket.setSoTimeout(ACCEPT_TIMEOUT);
- log.info(" port " + daemonPort + " OK");
log.info("Proxy up and running!");
while (running)
1.39 +3 -2
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
Index: ProxyControlGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ProxyControlGui.java 12 Feb 2004 00:29:50 -0000 1.38
+++ ProxyControlGui.java 12 Feb 2004 02:58:26 -0000 1.39
@@ -327,6 +327,7 @@
private void startProxy()
{
ValueReplacer replacer = GuiPackage.getInstance().getReplacer();
+ modifyTestElement(model);
try
{
replacer.replaceValues(model);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
