Author: sebb
Date: Sat Oct 20 16:58:17 2007
New Revision: 586822
URL: http://svn.apache.org/viewvc?rev=586822&view=rev
Log:
TestPlan and WorkBench should just have Paste and Reset
Fix Workbench so it remembers comments
Add clearGui() to TestPlan
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java?rev=586822&r1=586821&r2=586822&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
Sat Oct 20 16:58:17 2007
@@ -92,7 +92,7 @@
addMenu.add(MenuFactory.makeMenu(MenuFactory.POST_PROCESSORS,
ActionNames.ADD));
addMenu.add(MenuFactory.makeMenu(MenuFactory.LISTENERS,
ActionNames.ADD));
pop.add(addMenu);
- MenuFactory.addPasteMenu(pop);
+ MenuFactory.addPasteResetMenu(pop);
MenuFactory.addFileMenu(pop);
return pop;
}
@@ -194,5 +194,13 @@
southPanel.add(createClassPathPanel());
add(southPanel, BorderLayout.SOUTH);
+ }
+
+ public void clearGui() {
+ super.clearGui();
+ functionalMode.setSelected(false);
+ serializedMode.setSelected(false);
+ argsPanel.clear();
+ browseJar.clearFiles();
}
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java?rev=586822&r1=586821&r2=586822&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java
Sat Oct 20 16:58:17 2007
@@ -70,19 +70,6 @@
}
/**
- * A newly created component can be initialized with the contents of a
Test
- * Element object by calling this method. The component is responsible
for
- * querying the Test Element object for the relevant information to
display
- * in its GUI.
- *
- * @param element
- * the TestElement to configure
- */
- public void configure(TestElement element) {
- getNamePanel().configure(element);
- }
-
- /**
* When a user right-clicks on the component in the test tree, or
selects
* the edit menu when the component is selected, the component will be
asked
* to return a JPopupMenu that provides all the options available to the
@@ -104,7 +91,7 @@
JMeterUtils.getResString("add"), // $NON-NLS-1$
ActionNames.ADD);
menu.add(addMenu);
- MenuFactory.addEditMenu(menu, false);
+ MenuFactory.addPasteResetMenu(menu);
MenuFactory.addFileMenu(menu);
return menu;
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java?rev=586822&r1=586821&r2=586822&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
Sat Oct 20 16:58:17 2007
@@ -160,11 +160,14 @@
}
}
- public static void addPasteMenu(JPopupMenu menu) {
+ public static void addPasteResetMenu(JPopupMenu menu) {
addSeparator(menu);
menu.add(makeMenuItem(JMeterUtils.getResString("paste"),
//$NON-NLS-1$
"Paste", ActionNames.PASTE, //$NON-NLS-1$
KeyStrokes.PASTE));
+ menu.add(makeMenuItem(JMeterUtils.getResString("reset_gui"),
//$NON-NLS-1$
+ "Reset", ActionNames.RESET_GUI //$NON-NLS-1$
+ ));
}
public static void addFileMenu(JPopupMenu menu) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
