cvs commit: jakarta-jmeter/src_1/org/apache/jmeter/visualizers/gui AbstractVisualizer.java
mstover12002/08/11 16:18:03 Removed: src_1MANIFEST src_1/org/apache/jmeter JMeter.java NewDriver.java ProxyAuthenticator.java help.txt src_1/org/apache/jmeter/assertions Assertion.java AssertionResult.java DurationAssertion.java ResponseAssertion.java src_1/org/apache/jmeter/assertions/gui AbstractAssertionGui.java AssertionGui.java DurationAssertionGui.java src_1/org/apache/jmeter/config Argument.java Arguments.java ConfigElement.java ConfigTestElement.java ExtensionsFileFilter.java LoginConfig.java Modifier.java ResponseBasedModifier.java src_1/org/apache/jmeter/config/gui AbstractConfigGui.java AbstractModifierGui.java AbstractResponseBasedModifierGui.java ArgumentsPanel.java LoginConfigGui.java src_1/org/apache/jmeter/control Controller.java GenericController.java InterleaveControl.java LoopController.java ModifyController.java NoEntryException.java OnceOnlyController.java RandomController.java ResponseParser.java src_1/org/apache/jmeter/control/gui AbstractControllerGui.java InterleaveControlGui.java LogicControllerGui.java LoopControlPanel.java ModifyControllerGui.java OnceOnlyControllerGui.java RandomControlGui.java TestPlanGui.java WorkBenchGui.java src_1/org/apache/jmeter/engine ClientJMeterEngine.java ConvertListeners.java JMeterEngine.java JMeterEngineException.java LagDetector.java PreCompiler.java RemoteJMeterEngine.java RemoteJMeterEngineImpl.java StandardJMeterEngine.java TreeCloner.java src_1/org/apache/jmeter/exceptions IllegalUserActionException.java src_1/org/apache/jmeter/functions AbstractFunction.java CompoundFunction.java Function.java InvalidVariableException.java IterationCounter.java RegexFunction.java ThreadNumber.java src_1/org/apache/jmeter/functions/gui FunctionHelper.java src_1/org/apache/jmeter/gui AbstractJMeterGuiComponent.java GuiFactory.java GuiPackage.java GuiReady.java JMeterComponentModel.java JMeterFileFilter.java JMeterGUIComponent.java JMeterJListModel.java ListDialog.java MainFrame.java NamePanel.java src_1/org/apache/jmeter/gui/action AboutCommand.java AbstractAction.java ActionRouter.java AddParent.java AddToTree.java Analyze.java CheckDirty.java Clear.java Command.java CreateFunctionDialog.java DragNDrop.java EditCommand.java ExitCommand.java Load.java LookAndFeelCommand.java New.java RemoteStart.java Remove.java SSLManagerCommand.java Save.java Start.java src_1/org/apache/jmeter/gui/tree JMeterCellRenderer.java JMeterTreeListener.java JMeterTreeModel.java JMeterTreeNode.java src_1/org/apache/jmeter/gui/util ButtonPanel.java ComponentUtil.java FileDialoger.java FilePanel.java FocusRequester.java JLabeledChoice.java JLabeledField.java JLabeledPasswordField.java JLabeledTextArea.java JLabeledTextField.java JMeterColor.java JMeterMenuBar.java MenuFactory.java MenuInfo.java NumberFieldErrorListener.java PowerTableModel.java TextAreaCellRenderer.java TextAreaTableCellEditor.java VerticalLayout.java src_1/org/apache/jmeter/images Delete24.down.gif Delete24.gif Delete24.off.gif Delete24.on.gif Delete24.over.gif Edit24.down.gif Edit24.gif Edit24.off.gif Edit24.on.gif Edit24.over.gif New24.down.gif New24.gif New24.off.gif New24.on.gif New24.over.gif Open24.down.gif Open24.gif Open24.off.gif Open24.on.gif Open24.over.gif SaveAll24.down.gif SaveAll24.gif SaveAll24.off.gif SaveAll24.on.gif SaveAll24.over.gif
cvs commit: jakarta-jmeter/src_1/org/apache/jmeter/visualizers/gui AbstractVisualizer.java
mstover12002/06/06 06:48:27
Modified:src_1/org/apache/jmeter/assertions/gui
AbstractAssertionGui.java
src_1/org/apache/jmeter/config/gui AbstractConfigGui.java
AbstractModifierGui.java
AbstractResponseBasedModifierGui.java
src_1/org/apache/jmeter/control/gui
AbstractControllerGui.java
InterleaveControlGui.java LogicControllerGui.java
LoopControlPanel.java ModifyControllerGui.java
OnceOnlyControllerGui.java
src_1/org/apache/jmeter/gui MainFrame.java
src_1/org/apache/jmeter/gui/action ActionRouter.java
CheckDirty.java Load.java Save.java
src_1/org/apache/jmeter/gui/tree JMeterTreeModel.java
src_1/org/apache/jmeter/gui/util JMeterMenuBar.java
MenuFactory.java
src_1/org/apache/jmeter/protocol/http/control
AuthManager.java
src_1/org/apache/jmeter/reporters ResultCollector.java
src_1/org/apache/jmeter/samplers SampleResult.java
src_1/org/apache/jmeter/samplers/gui AbstractSamplerGui.java
src_1/org/apache/jmeter/save/old/handlers
FtpTestHandler.java JMeterHandler.java
JdbcTestSampleHandler.java
src_1/org/apache/jmeter/timers/gui AbstractTimerGui.java
src_1/org/apache/jmeter/visualizers StatVisualizer.java
src_1/org/apache/jmeter/visualizers/gui
AbstractVisualizer.java
Log:
Cleaning up abstract class hierarchy
further improvements to loading 1.7 test scripts
Revision ChangesPath
1.2 +8 -45
jakarta-jmeter/src_1/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java
Index: AbstractAssertionGui.java
===
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractAssertionGui.java 19 Apr 2002 02:31:47 - 1.1
+++ AbstractAssertionGui.java 6 Jun 2002 13:48:25 - 1.2
@@ -1,11 +1,13 @@
package org.apache.jmeter.assertions.gui;
-import org.apache.jmeter.gui.JMeterGUIComponent;
-import org.apache.jmeter.testelement.TestElement;
-import javax.swing.*;
-import java.util.*;
-import org.apache.jmeter.gui.util.MenuFactory;
+import java.util.Arrays;
+import java.util.Collection;
+
+import javax.swing.JPopupMenu;
+import org.apache.jmeter.gui.AbstractJMeterGuiComponent;
import org.apache.jmeter.gui.NamePanel;
+import org.apache.jmeter.gui.util.MenuFactory;
+import org.apache.jmeter.testelement.TestElement;
/**
* Title:JMeter
@@ -16,52 +18,13 @@
* @version 1.0
*/
-public abstract class AbstractAssertionGui extends JPanel implements
JMeterGUIComponent
+public abstract class AbstractAssertionGui extends AbstractJMeterGuiComponent
{
- private NamePanel namePanel;
-
- public AbstractAssertionGui()
- {
- namePanel = new NamePanel();
- setName(getStaticLabel());
- }
-
- public void setName(String name)
- {
- namePanel.setName(name);
- }
- public String getName()
- {
- return namePanel.getName();
- }
-
- protected NamePanel getNamePanel()
- {
- return namePanel;
- }
-
- protected void configureTestElement(TestElement mc)
- {
- mc.setProperty(TestElement.NAME, getName());
- mc.setProperty(TestElement.GUI_CLASS, this.getClass().getName());
- mc.setProperty(TestElement.TEST_CLASS, mc.getClass().getName());
- }
-
public JPopupMenu createPopupMenu()
{
return MenuFactory.getDefaultAssertionMenu();
}
-
- /
- * !ToDo (Method description)
- *
- *@param element !ToDo (Parameter description)
- ***/
- public void configure(TestElement element)
- {
- setName((String)element.getProperty(TestElement.NAME));
- }
public Collection getMenuCategories()
{
1.5 +10 -49
jakarta-jmeter/src_1/org/apache/jmeter/config/gui/AbstractConfigGui.java
Index: AbstractConfigGui.java
===
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/config/gui/AbstractConfigGui.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractConfigGui.java23 May 2002 15:47:04 - 1.4
+++ AbstractConfigGui.java6 Jun 2002 13:48:25 - 1.5
@@ -53,11
cvs commit: jakarta-jmeter/src_1/org/apache/jmeter/visualizers/gui AbstractVisualizer.java
mstover102/04/30 18:39:41
Modified:src_1/org/apache/jmeter/gui JMeterFileFilter.java
src_1/org/apache/jmeter/gui/action Analyze.java Load.java
src_1/org/apache/jmeter/gui/util FileDialoger.java
FilePanel.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/threads JMeterThread.java
src_1/org/apache/jmeter/util ClassFinder.java
SearchByClass.java
src_1/org/apache/jmeter/visualizers AssertionVisualizer.java
GraphAccumVisualizer.java SplineVisualizer.java
StatVisualizer.java TableVisualizer.java
ViewResultsFullVisualizer.java
ViewResultsVisualizer.java
src_1/org/apache/jmeter/visualizers/gui
AbstractVisualizer.java
Added: src_1/org/apache/jmeter/threads JMeterThreadMonitor.java
Log:
Debugging results-saving code in src_1
Revision ChangesPath
1.3 +25 -2 jakarta-jmeter/src_1/org/apache/jmeter/gui/JMeterFileFilter.java
Index: JMeterFileFilter.java
===
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/gui/JMeterFileFilter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JMeterFileFilter.java 29 Apr 2002 17:08:08 - 1.2
+++ JMeterFileFilter.java 1 May 2002 01:39:40 - 1.3
@@ -58,8 +58,15 @@
import java.io.*;
import javax.swing.*;
import javax.swing.filechooser.*;
+import java.util.Arrays;
public class JMeterFileFilter extends javax.swing.filechooser.FileFilter {
+ String[] exts;
+
+ public JMeterFileFilter(String[] extensions)
+ {
+ exts = extensions;
+ }
public boolean accept(File f) {
boolean isAccepted = false;
@@ -67,7 +74,7 @@
if (f.isDirectory()) {
isAccepted = true;
} else {
- if (f.getName().toLowerCase().endsWith(".jmx")) {
+ if (accept(f.getName().toLowerCase())) {
isAccepted = true;
} else {
isAccepted = false;
@@ -76,8 +83,24 @@
return isAccepted;
}
+
+ public boolean accept(String filename)
+ {
+ for(int i = 0;i < exts.length;i++)
+ {
+ if(filename.endsWith(exts[i]))
+ {
+ return true;
+ }
+ }
+ if(exts.length == 0)
+ {
+ return true;
+ }
+ return false;
+ }
public String getDescription() {
- return "JMeter (*.jmx)";
+ return "JMeter "+Arrays.asList(exts).toString();
}
}
1.3 +2 -2 jakarta-jmeter/src_1/org/apache/jmeter/gui/action/Analyze.java
Index: Analyze.java
===
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/gui/action/Analyze.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Analyze.java 29 Apr 2002 17:08:08 - 1.2
+++ Analyze.java 1 May 2002 01:39:40 - 1.3
@@ -72,7 +72,7 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@authorMichael Stover
- *@created $Date: 2002/04/29 17:08:08 $
+ *@created $Date: 2002/05/01 01:39:40 $
*@version 1.0
***/
public class Analyze implements Command
@@ -108,7 +108,7 @@
public void doAction(ActionEvent e)
{
FileReporter analyzer = new FileReporter();
- File f = FileDialoger.promptToOpenFile().getSelectedFile();
+ File f = FileDialoger.promptToOpenFile(new
String[]{".jtl"}).getSelectedFile();
if(f != null)
{
try
1.3 +2 -2 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Load.java 29 Apr 2002 17:08:08 - 1.2
+++ Load.java 1 May 2002 01:39:40 - 1.3
@@ -75,7 +75,7 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
cvs commit: jakarta-jmeter/src_1/org/apache/jmeter/visualizers/gui AbstractVisualizer.java
mstover102/04/26 16:26:15 Modified:.build.xml src_1/org/apache/jmeter/assertions Assertion.java src_1/org/apache/jmeter/assertions/gui AssertionGui.java src_1/org/apache/jmeter/control LoopController.java src_1/org/apache/jmeter/control/gui LoopControlPanel.java src_1/org/apache/jmeter/gui NamePanel.java src_1/org/apache/jmeter/gui/action Clear.java src_1/org/apache/jmeter/junit/protocol/http/parser HtmlParserTester.java src_1/org/apache/jmeter/protocol/ftp/sampler FTPSampler.java src_1/org/apache/jmeter/protocol/http/config UrlConfig.java src_1/org/apache/jmeter/protocol/http/config/gui MultipartUrlConfigGui.java UrlConfigGui.java src_1/org/apache/jmeter/protocol/http/control/gui HttpTestSampleGui.java src_1/org/apache/jmeter/protocol/http/modifier AnchorModifier.java src_1/org/apache/jmeter/protocol/http/parser HtmlParser.java src_1/org/apache/jmeter/protocol/http/proxy HttpRequestHdr.java src_1/org/apache/jmeter/protocol/http/sampler HTTPSampler.java HTTPSamplerFull.java MultipartFormSamplerFull.java src_1/org/apache/jmeter/protocol/jdbc/sampler JDBCSampler.java src_1/org/apache/jmeter/reporters ResultCollector.java src_1/org/apache/jmeter/samplers SampleResult.java Sampler.java src_1/org/apache/jmeter/threads JMeterThread.java src_1/org/apache/jmeter/threads/gui ThreadGroupGui.java src_1/org/apache/jmeter/visualizers AssertionVisualizer.java GraphAccumModel.java GraphAccumVisualizer.java GraphVisualizer.java MailerVisualizer.java SplineVisualizer.java StatVisualizer.java StatVisualizerModel.java TableVisualizer.java ViewResultsFullVisualizer.java ViewResultsVisualizer.java src_1/org/apache/jmeter/visualizers/gui AbstractVisualizer.java Log: Cleaning up little issues, fixing unit tests Revision ChangesPath 1.54 +8 -2 jakarta-jmeter/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-jmeter/build.xml,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- build.xml 29 Mar 2002 13:43:44 - 1.53 +++ build.xml 26 Apr 2002 23:26:12 - 1.54 @@ -127,7 +127,13 @@ - + + + + + + + @@ -161,7 +167,7 @@ - +
