You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by ms...@apache.org on 2003/08/17 16:12:37 UTC
cvs commit: jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control CookieManager.java
mstover1 2003/08/17 07:12:37
Modified: . Tag: v1_9_branch build.xml
src/components/org/apache/jmeter/timers/gui Tag: v1_9_branch
ConstantThroughputTimerGui.java
ConstantTimerGui.java GaussianRandomTimerGui.java
UniformRandomTimerGui.java
src/core/org/apache/jmeter/config/gui Tag: v1_9_branch
ArgumentsPanel.java
src/core/org/apache/jmeter/gui Tag: v1_9_branch
GuiPackage.java
src/jorphan/org/apache/jorphan/gui Tag: v1_9_branch
ObjectTableModel.java
src/protocol/http/org/apache/jmeter/protocol/http/control
Tag: v1_9_branch CookieManager.java
Log:
various bug fixes
Revision Changes Path
No revision
No revision
1.111.2.1 +2 -1 jakarta-jmeter/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-jmeter/build.xml,v
retrieving revision 1.111
retrieving revision 1.111.2.1
diff -u -r1.111 -r1.111.2.1
--- build.xml 12 Aug 2003 19:33:31 -0000 1.111
+++ build.xml 17 Aug 2003 14:12:36 -0000 1.111.2.1
@@ -127,7 +127,7 @@
<target name="init" depends="check-libs,report-missing-libs">
<tstamp/>
<!-- JMeter version -->
- <property name="version" value="1.9"/>
+ <property name="version" value="1.9.${DSTAMP}"/>
</target>
<!-- JMeter Javadoc version (keep in line with above) -->
@@ -231,6 +231,7 @@
<javac srcdir="${src.http}" destdir="${build.http}" optimize="${optimize}" debug="on" target="${target.java.version}" deprecation="${deprecation}" encoding="${encoding}">
<include name="**/*.java"/>
<exclude name="org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java" unless="javamail.complete"/>
+ <exclude name="org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java" unless="javamail.complete"/>
<classpath>
<path refid="classpath"/>
<pathelement location="${build.jorphan}"/>
No revision
No revision
1.6.2.1 +10 -1 jakarta-jmeter/src/components/org/apache/jmeter/timers/gui/ConstantThroughputTimerGui.java
Index: ConstantThroughputTimerGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/timers/gui/ConstantThroughputTimerGui.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- ConstantThroughputTimerGui.java 23 Apr 2003 18:52:06 -0000 1.6
+++ ConstantThroughputTimerGui.java 17 Aug 2003 14:12:36 -0000 1.6.2.1
@@ -156,4 +156,13 @@
add(throughputPanel);
}
+
+ /* (non-Javadoc)
+ * @see org.apache.jmeter.gui.JMeterGUIComponent#clear()
+ */
+ public void clear()
+ {
+ throughputField.setText(DEFAULT_THROUGHPUT);
+ super.clear();
+ }
}
1.6.2.1 +10 -1 jakarta-jmeter/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java
Index: ConstantTimerGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- ConstantTimerGui.java 20 Apr 2003 21:53:38 -0000 1.6
+++ ConstantTimerGui.java 17 Aug 2003 14:12:36 -0000 1.6.2.1
@@ -167,4 +167,13 @@
add(delayPanel);
}
+
+ /* (non-Javadoc)
+ * @see org.apache.jmeter.gui.JMeterGUIComponent#clear()
+ */
+ public void clear()
+ {
+ delayField.setText(DEFAULT_DELAY);
+ super.clear();
+ }
}
1.8.2.1 +11 -1 jakarta-jmeter/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java
Index: GaussianRandomTimerGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- GaussianRandomTimerGui.java 23 Apr 2003 18:52:06 -0000 1.8
+++ GaussianRandomTimerGui.java 17 Aug 2003 14:12:36 -0000 1.8.2.1
@@ -198,5 +198,15 @@
// Set the initial focus to the delay field
new FocusRequester(rangeField);
}
+
+ /* (non-Javadoc)
+ * @see org.apache.jmeter.gui.JMeterGUIComponent#clear()
+ */
+ public void clear()
+ {
+ rangeField.setText(DEFAULT_RANGE);
+ delayField.setText(DEFAULT_DELAY);
+ super.clear();
+ }
}
1.9.2.1 +11 -2 jakarta-jmeter/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java
Index: UniformRandomTimerGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- UniformRandomTimerGui.java 25 Apr 2003 20:50:55 -0000 1.9
+++ UniformRandomTimerGui.java 17 Aug 2003 14:12:36 -0000 1.9.2.1
@@ -198,5 +198,14 @@
// Set the initial focus to the range field
new FocusRequester(rangeField);
}
-
+
+ /* (non-Javadoc)
+ * @see org.apache.jmeter.gui.JMeterGUIComponent#clear()
+ */
+ public void clear()
+ {
+ rangeField.setText(DEFAULT_RANGE);
+ delayField.setText(DEFAULT_DELAY);
+ super.clear();
+ }
}
No revision
No revision
1.19.2.1 +2 -1 jakarta-jmeter/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
Index: ArgumentsPanel.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -r1.19 -r1.19.2.1
--- ArgumentsPanel.java 6 Aug 2003 19:35:37 -0000 1.19
+++ ArgumentsPanel.java 17 Aug 2003 14:12:36 -0000 1.19.2.1
@@ -280,6 +280,7 @@
*/
public void clear()
{
+ stopTableEditing();
tableModel.clearData();
}
No revision
No revision
1.15.2.1 +37 -50 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.15
retrieving revision 1.15.2.1
diff -u -r1.15 -r1.15.2.1
--- GuiPackage.java 10 Jun 2003 16:27:20 -0000 1.15
+++ GuiPackage.java 17 Aug 2003 14:12:36 -0000 1.15.2.1
@@ -68,6 +68,7 @@
import org.apache.jmeter.gui.tree.JMeterTreeNode;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.TestPlan;
+import org.apache.jmeter.visualizers.gui.AbstractVisualizer;
import org.apache.jorphan.collections.HashTree;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
@@ -86,51 +87,48 @@
public class GuiPackage
{
/** Logging. */
- private static transient Logger log =
- LoggingManager.getLoggerForClass();
+ private static transient Logger log = LoggingManager.getLoggerForClass();
/** Singleton instance. */
private static GuiPackage guiPack;
-
+
/**
* Flag indicating whether or not parts of the tree have changed since
* they were last saved.
*/
private boolean dirty = false;
-
+
/**
* Map from TestElement to JMeterGUIComponent, mapping the nodes in the
* tree to their corresponding GUI components.
*/
private Map nodesToGui = new HashMap();
-
+
/**
* Map from String to JMeterGUIComponent, mapping the fully qualified class
* name of a GUI component to an instance of that component.
*/
private Map guis = new HashMap();
-
+
/** The currently selected node in the tree. */
private JMeterTreeNode currentNode = null;
-
+
/** The model for JMeter's test tree. */
private JMeterTreeModel treeModel;
-
+
/** The listener for JMeter's test tree. */
private JMeterTreeListener treeListener;
/** The main JMeter frame. */
private MainFrame mainFrame;
-
/**
* Private constructor to permit instantiation only from within this class.
* Use {@link #getInstance()} to retrieve a singleton instance.
*/
private GuiPackage()
- {
- }
-
+ {}
+
/**
* Retrieve the singleton GuiPackage instance.
*
@@ -140,7 +138,7 @@
{
return guiPack;
}
-
+
/**
* When GuiPackage is requested for the first time, it should be given
* handles to JMeter's Tree Listener and TreeModel.
@@ -150,9 +148,7 @@
*
* @return GuiPackage
*/
- public static GuiPackage getInstance(
- JMeterTreeListener listener,
- JMeterTreeModel treeModel)
+ public static GuiPackage getInstance(JMeterTreeListener listener, JMeterTreeModel treeModel)
{
if (guiPack == null)
{
@@ -227,7 +223,7 @@
{
nodesToGui.remove(node);
}
-
+
/**
* Convenience method for grabbing the gui for the current node.
*
@@ -237,9 +233,12 @@
{
try
{
- TestElement currentNode =
- treeListener.getCurrentNode().createTestElement();
+ TestElement currentNode = treeListener.getCurrentNode().createTestElement();
JMeterGUIComponent comp = getGui(currentNode);
+ if (!(comp instanceof AbstractVisualizer)) // a hack that needs to be fixed for 2.0
+ {
+ comp.clear();
+ }
comp.configure(currentNode);
return comp;
}
@@ -249,7 +248,7 @@
return null;
}
}
-
+
/**
* Find the JMeterTreeNode for a certain TestElement object.
* @param userObject the test element to search for
@@ -259,7 +258,7 @@
{
return treeModel.getNodeOf(userObject);
}
-
+
/**
* Create a TestElement corresponding to the specified GUI class.
*
@@ -303,10 +302,7 @@
* @throws ClassNotFoundException if the specified GUI class cannot be
* found
*/
- private JMeterGUIComponent getGuiFromCache(String guiClass)
- throws InstantiationException,
- IllegalAccessException,
- ClassNotFoundException
+ private JMeterGUIComponent getGuiFromCache(String guiClass) throws InstantiationException, IllegalAccessException, ClassNotFoundException
{
JMeterGUIComponent comp = (JMeterGUIComponent) guis.get(guiClass);
if (comp == null)
@@ -348,10 +344,8 @@
{
if (currentNode != null)
{
- log.debug(
- "Updating current node " + currentNode.createTestElement());
- JMeterGUIComponent comp =
- getGui(currentNode.createTestElement());
+ log.debug("Updating current node " + currentNode.createTestElement());
+ JMeterGUIComponent comp = getGui(currentNode.createTestElement());
TestElement el = currentNode.createTestElement();
comp.modifyTestElement(el);
}
@@ -375,7 +369,7 @@
{
this.dirty = dirty;
}
-
+
/**
* Retrieves the state of the 'dirty' property, a flag that indicates if
* there are test tree components that have been modified since they were
@@ -388,7 +382,7 @@
{
return dirty;
}
-
+
/**
* Add a subtree to the currently selected node.
*
@@ -399,12 +393,11 @@
* @throws IllegalUserActionException if a subtree cannot be added to the
* currently selected node
*/
- public HashTree addSubTree(HashTree subTree)
- throws IllegalUserActionException
+ public HashTree addSubTree(HashTree subTree) throws IllegalUserActionException
{
return treeModel.addSubTree(subTree, treeListener.getCurrentNode());
}
-
+
/**
* Get the currently selected subtree.
*
@@ -414,7 +407,7 @@
{
return treeModel.getCurrentSubTree(treeListener.getCurrentNode());
}
-
+
/**
* Get the model for JMeter's test tree.
*
@@ -434,7 +427,7 @@
{
treeModel = newTreeModel;
}
-
+
/**
* Get a ValueReplacer for the test tree.
*
@@ -442,11 +435,7 @@
*/
public ValueReplacer getReplacer()
{
- return new ValueReplacer(
- (TestPlan) ((JMeterGUIComponent) getTreeModel()
- .getTestPlan()
- .getArray()[0])
- .createTestElement());
+ return new ValueReplacer((TestPlan) ((JMeterGUIComponent) getTreeModel().getTestPlan().getArray()[0]).createTestElement());
}
/**
@@ -458,7 +447,7 @@
{
mainFrame = newMainFrame;
}
-
+
/**
* Get the main JMeter frame.
*
@@ -468,7 +457,7 @@
{
return mainFrame;
}
-
+
/**
* Set the listener for JMeter's test tree.
*
@@ -478,7 +467,7 @@
{
treeListener = newTreeListener;
}
-
+
/**
* Get the listener for JMeter's test tree.
*
@@ -488,7 +477,7 @@
{
return treeListener;
}
-
+
/**
* Display the specified popup menu with the source component and location
* from the specified mouse event.
@@ -513,10 +502,8 @@
{
if (popup != null)
{
- log.debug(
- "Showing pop up for " + invoker
- + " at x,y = " + e.getX() + "," + e.getY());
-
+ log.debug("Showing pop up for " + invoker + " at x,y = " + e.getX() + "," + e.getY());
+
popup.pack();
popup.show(invoker, e.getX(), e.getY());
popup.setVisible(true);
No revision
No revision
1.1.2.1 +19 -13 jakarta-jmeter/src/jorphan/org/apache/jorphan/gui/ObjectTableModel.java
Index: ObjectTableModel.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/jorphan/org/apache/jorphan/gui/ObjectTableModel.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- ObjectTableModel.java 14 Mar 2003 21:15:36 -0000 1.1
+++ ObjectTableModel.java 17 Aug 2003 14:12:37 -0000 1.1.2.1
@@ -163,21 +163,27 @@
*/
public void setValueAt(Object cellValue, int row, int col)
{
- Object value = objects.get(row);
- Method setMethod = (Method)setMethods.get(col);
- try
+ if (row < objects.size())
{
- setMethod.invoke(value,new Object[]{cellValue});
+ Object value = objects.get(row);
+ if (col < setMethods.size())
+ {
+ Method setMethod = (Method) setMethods.get(col);
+ try
+ {
+ setMethod.invoke(value, new Object[] { cellValue });
+ }
+ catch (IllegalAccessException e)
+ {
+ log.error("Illegal method access", e);
+ }
+ catch (InvocationTargetException e)
+ {
+ log.error("incorrect method access", e);
+ }
+ super.fireTableDataChanged();
+ }
}
- catch (IllegalAccessException e)
- {
- log.error("Illegal method access",e);
- }
- catch (InvocationTargetException e)
- {
- log.error("incorrect method access",e);
- }
- super.fireTableDataChanged();
}
/**
No revision
No revision
1.14.2.1 +5 -2 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
Index: CookieManager.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -r1.14 -r1.14.2.1
--- CookieManager.java 18 Jul 2003 14:38:01 -0000 1.14
+++ CookieManager.java 17 Aug 2003 14:12:37 -0000 1.14.2.1
@@ -231,7 +231,10 @@
public void add(Cookie c)
{
getCookies().addItem(c);
- JMeterContextService.getContext().getVariables().put(c.getName(),c.getValue());
+ if(JMeterContextService.getContext().isSamplingStarted())
+ {
+ JMeterContextService.getContext().getVariables().put(c.getName(),c.getValue());
+ }
}
/** add an empty cookie */
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org