I just downloaded the new Eclipse 2.1 build, and it came up with a bunch of warnings for JMeter. The attached patch gets rid of most of these warnings: unused import statements were removed, and static fields which were accessed through an instance variable are now accessed through the class. There are still a few warnings left, but I'll handle those in a separate patch later.
Jeremy
Index: src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java,v
retrieving revision 1.7
diff -u -r1.7 AssertionVisualizer.java
--- src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java 11 Mar
2003 19:04:18 -0000 1.7
+++ src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java 30 Mar
2003 12:15:47 -0000
@@ -57,9 +57,6 @@
import java.awt.BorderLayout;
import java.awt.Font;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
import javax.swing.JLabel;
import javax.swing.JPanel;
Index: src/components/org/apache/jmeter/visualizers/GraphVisualizer.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java,v
retrieving revision 1.8
diff -u -r1.8 GraphVisualizer.java
--- src/components/org/apache/jmeter/visualizers/GraphVisualizer.java 26 Mar 2003
15:19:23 -0000 1.8
+++ src/components/org/apache/jmeter/visualizers/GraphVisualizer.java 30 Mar 2003
12:15:48 -0000
@@ -66,7 +66,6 @@
import javax.swing.BorderFactory;
import javax.swing.Box;
-import javax.swing.BoxLayout;
import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
Index: src/core/org/apache/jmeter/control/gui/WorkBenchGui.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jmeter/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java,v
retrieving revision 1.6
diff -u -r1.6 WorkBenchGui.java
--- src/core/org/apache/jmeter/control/gui/WorkBenchGui.java 25 Mar 2003 17:24:32
-0000 1.6
+++ src/core/org/apache/jmeter/control/gui/WorkBenchGui.java 30 Mar 2003 12:15:48
-0000
@@ -64,7 +64,6 @@
import javax.swing.border.EmptyBorder;
import org.apache.jmeter.gui.AbstractJMeterGuiComponent;
-import org.apache.jmeter.gui.NamePanel;
import org.apache.jmeter.gui.tree.JMeterTreeNode;
import org.apache.jmeter.gui.util.MenuFactory;
import org.apache.jmeter.testelement.TestElement;
Index: src/core/org/apache/jmeter/gui/ListDialog.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jmeter/src/core/org/apache/jmeter/gui/ListDialog.java,v
retrieving revision 1.3
diff -u -r1.3 ListDialog.java
--- src/core/org/apache/jmeter/gui/ListDialog.java 5 Feb 2003 05:12:06 -0000
1.3
+++ src/core/org/apache/jmeter/gui/ListDialog.java 30 Mar 2003 12:15:48 -0000
@@ -119,28 +119,28 @@
setLayout(gridBag);
c.gridx = 0;
c.gridy = 0;
- c.anchor = c.EAST;
+ c.anchor = GridBagConstraints.EAST;
c.weightx = 0;
add(name, c.clone());
c.weightx = 1;
- c.fill = c.HORIZONTAL;
+ c.fill = GridBagConstraints.HORIZONTAL;
c.gridx++;
- c.anchor = c.WEST;
+ c.anchor = GridBagConstraints.WEST;
add(nameField, c.clone());
c.weightx = 0;
- c.fill = c.NONE;
+ c.fill = GridBagConstraints.NONE;
c.gridy++;
c.gridx--;
- c.anchor = c.EAST;
+ c.anchor = GridBagConstraints.EAST;
add(value, c.clone());
c.weightx = 1;
- c.fill = c.HORIZONTAL;
+ c.fill = GridBagConstraints.HORIZONTAL;
c.gridx++;
- c.anchor = c.WEST;
+ c.anchor = GridBagConstraints.WEST;
add(valueField, c.clone());
input = new JList();
int x = 0;
- c.fill = c.BOTH;
+ c.fill = GridBagConstraints.BOTH;
c.weightx = c.weighty = 1;
c.gridy++;
c.gridx--;
@@ -150,8 +150,8 @@
c.weightx = .5;
c.gridy++;
c.weighty = 0;
- c.fill = c.NONE;
- c.anchor = c.EAST;
+ c.fill = GridBagConstraints.NONE;
+ c.anchor = GridBagConstraints.EAST;
ok = new JButton("OK");
cancel = new JButton("Cancel");
ok.setPreferredSize(cancel.getPreferredSize());
@@ -160,7 +160,7 @@
cancel.addActionListener(listener);
add(ok, c.clone());
c.gridx = 1;
- c.anchor = c.WEST;
+ c.anchor = GridBagConstraints.WEST;
add(cancel, c);
}
//end of Method
Index: src/core/org/apache/jmeter/gui/MainFrame.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jmeter/src/core/org/apache/jmeter/gui/MainFrame.java,v
retrieving revision 1.8
diff -u -r1.8 MainFrame.java
--- src/core/org/apache/jmeter/gui/MainFrame.java 31 Jan 2003 18:25:09 -0000
1.8
+++ src/core/org/apache/jmeter/gui/MainFrame.java 30 Mar 2003 12:15:49 -0000
@@ -371,7 +371,7 @@
gbc.gridy = 0;
gbc.gridheight = 1;
gbc.gridwidth = 1;
- gbc.fill = gbc.BOTH;
+ gbc.fill = GridBagConstraints.BOTH;
gbc.weightx = 1;
gbc.weighty = 0;
all.add(toolPanel, gbc.clone());
Index: src/core/org/apache/jmeter/gui/action/RemoteStart.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/RemoteStart.java,v
retrieving revision 1.8
diff -u -r1.8 RemoteStart.java
--- src/core/org/apache/jmeter/gui/action/RemoteStart.java 14 Mar 2003 00:31:19
-0000 1.8
+++ src/core/org/apache/jmeter/gui/action/RemoteStart.java 30 Mar 2003 12:15:49
-0000
@@ -59,8 +59,6 @@
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.Iterator;
-import java.util.StringTokenizer;
import javax.swing.JOptionPane;
Index: src/core/org/apache/jmeter/gui/util/ButtonPanel.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jmeter/src/core/org/apache/jmeter/gui/util/ButtonPanel.java,v
retrieving revision 1.2
diff -u -r1.2 ButtonPanel.java
--- src/core/org/apache/jmeter/gui/util/ButtonPanel.java 5 Feb 2003 05:12:08
-0000 1.2
+++ src/core/org/apache/jmeter/gui/util/ButtonPanel.java 30 Mar 2003 12:15:49
-0000
@@ -156,7 +156,7 @@
GridBagLayout g = new GridBagLayout();
this.setLayout(g);
GridBagConstraints c = new GridBagConstraints();
- c.fill = c.NONE;
+ c.fill = GridBagConstraints.NONE;
c.gridwidth = 1;
c.gridheight = 1;
c.gridx = 1;
Index: src/core/org/apache/jmeter/gui/util/FileDialoger.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jmeter/src/core/org/apache/jmeter/gui/util/FileDialoger.java,v
retrieving revision 1.2
diff -u -r1.2 FileDialoger.java
--- src/core/org/apache/jmeter/gui/util/FileDialoger.java 24 Aug 2002 16:51:13
-0000 1.2
+++ src/core/org/apache/jmeter/gui/util/FileDialoger.java 30 Mar 2003 12:15:49
-0000
@@ -111,7 +111,7 @@
int retVal =
jfc.showOpenDialog(GuiPackage.getInstance().getMainFrame());
lastJFCDirectory = jfc.getCurrentDirectory().getAbsolutePath();
- if(retVal == jfc.APPROVE_OPTION)
+ if(retVal == JFileChooser.APPROVE_OPTION)
{
return jfc;
}
@@ -175,7 +175,7 @@
int retVal =
jfc.showSaveDialog(GuiPackage.getInstance().getMainFrame());
lastJFCDirectory = jfc.getCurrentDirectory().getAbsolutePath();
- if(retVal == jfc.APPROVE_OPTION)
+ if(retVal == JFileChooser.APPROVE_OPTION)
{
return jfc;
}
Index: src/core/org/apache/jmeter/reporters/FileReporter.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jmeter/src/core/org/apache/jmeter/reporters/FileReporter.java,v
retrieving revision 1.5
diff -u -r1.5 FileReporter.java
--- src/core/org/apache/jmeter/reporters/FileReporter.java 4 Feb 2003 21:29:15
-0000 1.5
+++ src/core/org/apache/jmeter/reporters/FileReporter.java 30 Mar 2003 12:15:50
-0000
@@ -265,7 +265,7 @@
GridBagConstraints c = new GridBagConstraints();
c.insets = new Insets(3, 3, 3, 3);
- c.fill = c.BOTH;
+ c.fill = GridBagConstraints.BOTH;
c.gridwidth = 1;
c.gridheight = 1;
for (int t = 0; t < keys.size(); t++)
@@ -321,7 +321,7 @@
GridBagConstraints c = new GridBagConstraints();
c.insets = new Insets(3, 6, 3, 6);
- c.fill = c.BOTH;
+ c.fill = GridBagConstraints.BOTH;
c.gridwidth = 1;
c.gridheight = 1;
JLabel count = new JLabel("Count: " + total);
Index: src/core/org/apache/jmeter/samplers/SampleResult.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jmeter/src/core/org/apache/jmeter/samplers/SampleResult.java,v
retrieving revision 1.5
diff -u -r1.5 SampleResult.java
--- src/core/org/apache/jmeter/samplers/SampleResult.java 11 Mar 2003 19:04:18
-0000 1.5
+++ src/core/org/apache/jmeter/samplers/SampleResult.java 30 Mar 2003 12:15:50
-0000
@@ -55,10 +55,8 @@
package org.apache.jmeter.samplers;
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import org.apache.avalon.framework.configuration.Configuration;
Index: src/core/org/apache/jmeter/threads/ListenerNotifier.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jmeter/src/core/org/apache/jmeter/threads/ListenerNotifier.java,v
retrieving revision 1.12
diff -u -r1.12 ListenerNotifier.java
--- src/core/org/apache/jmeter/threads/ListenerNotifier.java 26 Mar 2003 15:19:23
-0000 1.12
+++ src/core/org/apache/jmeter/threads/ListenerNotifier.java 30 Mar 2003 12:15:50
-0000
@@ -1,16 +1,15 @@
package org.apache.jmeter.threads;
import java.util.Iterator;
-import java.util.LinkedList;
import java.util.List;
+import org.apache.commons.collections.Buffer;
+import org.apache.commons.collections.BufferUtils;
+import org.apache.commons.collections.UnboundedFifoBuffer;
import org.apache.jmeter.samplers.SampleEvent;
import org.apache.jmeter.samplers.SampleListener;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
-import org.apache.commons.collections.Buffer;
-import org.apache.commons.collections.BufferUtils;
-import org.apache.commons.collections.UnboundedFifoBuffer;
/**
* The <code>ListenerNotifier</code> thread is responsible for performing
Index: src/functions/org/apache/jmeter/functions/RegexFunction.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jmeter/src/functions/org/apache/jmeter/functions/RegexFunction.java,v
retrieving revision 1.11
diff -u -r1.11 RegexFunction.java
--- src/functions/org/apache/jmeter/functions/RegexFunction.java 10 Mar 2003
17:28:11 -0000 1.11
+++ src/functions/org/apache/jmeter/functions/RegexFunction.java 30 Mar 2003
12:15:51 -0000
@@ -8,10 +8,7 @@
import java.util.List;
import java.util.Random;
-import junit.framework.TestCase;
-
import org.apache.jmeter.engine.util.CompoundVariable;
-import org.apache.jmeter.functions.util.ArgumentEncoder;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.samplers.Sampler;
import org.apache.jmeter.threads.JMeterVariables;
Index: src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jmeter/src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java,v
retrieving revision 1.1
diff -u -r1.1 JLabeledChoice.java
--- src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java 17 Oct 2002 19:47:18
-0000 1.1
+++ src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java 30 Mar 2003 12:15:51
-0000
@@ -55,15 +55,22 @@
package org.apache.jorphan.gui;
-import java.util.*;
-import javax.swing.*;
-import java.awt.event.*;
-import java.awt.Component;
import java.awt.Insets;
-import javax.swing.event.ChangeListener;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
import javax.swing.event.ChangeEvent;
-import java.util.*;
-import javax.swing.plaf.basic.BasicComboBoxEditor;
+import javax.swing.event.ChangeListener;
public class JLabeledChoice extends JPanel implements JLabeledField
@@ -138,7 +145,7 @@
*/
public void itemStateChanged(ItemEvent e)
{
- if(e.getStateChange() == e.SELECTED)
+ if(e.getStateChange() == ItemEvent.SELECTED)
{
notifyChangeListeners();
}
Index: src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/FtpConfig.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jmeter/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/FtpConfig.java,v
retrieving revision 1.1
diff -u -r1.1 FtpConfig.java
--- src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/FtpConfig.java 11 Aug
2002 19:24:50 -0000 1.1
+++ src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/FtpConfig.java 30 Mar
2003 12:15:51 -0000
@@ -54,11 +54,10 @@
*/
package org.apache.jmeter.protocol.ftp.config;
-import org.apache.jmeter.config.*;
+import java.io.Serializable;
+
+import org.apache.jmeter.config.ConfigTestElement;
import org.apache.jmeter.protocol.ftp.sampler.FTPSampler;
-import org.apache.jmeter.util.JMeterUtils;
-import java.util.Collection;
-import java.io.*;
/**
* Title: JMeter
Index: src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jmeter/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java,v
retrieving revision 1.3
diff -u -r1.3 FTPSampler.java
--- src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java 14 Mar
2003 21:15:36 -0000 1.3
+++ src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java 30 Mar
2003 12:15:51 -0000
@@ -54,14 +54,16 @@
*/
package org.apache.jmeter.protocol.ftp.sampler;
-import java.sql.*;
-import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jmeter.config.*;
-import org.apache.jmeter.protocol.ftp.config.*;
-import org.apache.jmeter.samplers.Sampler;
-import org.apache.jmeter.samplers.SampleResult;
-import org.apache.jmeter.samplers.Entry;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
+
+import org.apache.jmeter.config.ConfigTestElement;
+import org.apache.jmeter.config.LoginConfig;
+import org.apache.jmeter.protocol.ftp.config.FtpConfig;
import org.apache.jmeter.samplers.AbstractSampler;
+import org.apache.jmeter.samplers.Entry;
+import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.testelement.PerSampleClonable;
import org.apache.jmeter.testelement.TestElement;
Index:
src/protocol/http/org/apache/jmeter/junit/protocol/http/parser/HtmlParserTester.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jmeter/src/protocol/http/org/apache/jmeter/junit/protocol/http/parser/HtmlParserTester.java,v
retrieving revision 1.1
diff -u -r1.1 HtmlParserTester.java
---
src/protocol/http/org/apache/jmeter/junit/protocol/http/parser/HtmlParserTester.java
11 Aug 2002 19:24:50 -0000 1.1
+++
src/protocol/http/org/apache/jmeter/junit/protocol/http/parser/HtmlParserTester.java
30 Mar 2003 12:15:52 -0000
@@ -225,7 +225,7 @@
{
HTTPSampler config = new HTTPSampler();
config.setDomain("www.apache.org");
- config.setMethod(config.GET);
+ config.setMethod(HTTPSampler.GET);
config.setPath(path);
config.setPort(80);
config.setProtocol("http");
Index: src/protocol/http/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java,v
retrieving revision 1.5
diff -u -r1.5 MultipartUrlConfig.java
--- src/protocol/http/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java
14 Mar 2003 21:15:36 -0000 1.5
+++ src/protocol/http/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java
30 Mar 2003 12:15:52 -0000
@@ -59,7 +59,6 @@
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.protocol.http.util.HTTPArgument;
-import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.util.JOrphanUtils;
/**
Index: src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java,v
retrieving revision 1.3
diff -u -r1.3 AuthManager.java
--- src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java 25 Mar
2003 17:24:35 -0000 1.3
+++ src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java 30 Mar
2003 12:15:52 -0000
@@ -64,7 +64,6 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
-import java.util.LinkedList;
import java.util.List;
import java.util.StringTokenizer;
Index: src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java,v
retrieving revision 1.7
diff -u -r1.7 HeaderPanel.java
--- src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java 28 Feb
2003 14:21:50 -0000 1.7
+++ src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java 30 Mar
2003 12:15:52 -0000
@@ -448,7 +448,7 @@
main.setLayout(g);
GridBagConstraints c = new GridBagConstraints();
- c.fill = c.BOTH;
+ c.fill = GridBagConstraints.BOTH;
c.gridwidth = 1;
c.gridheight = 1;
JLabel nameLabel = new JLabel(JMeterUtils.getResString("name")
+ ":");
Index:
src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLParser.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLParser.java,v
retrieving revision 1.1
diff -u -r1.1 UserParameterXMLParser.java
---
src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLParser.java
11 Aug 2002 19:24:51 -0000 1.1
+++
src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLParser.java
30 Mar 2003 12:15:53 -0000
@@ -54,11 +54,13 @@
*/
package org.apache.jmeter.protocol.http.modifier;
-import org.xml.sax.*;
-import org.xml.sax.helpers.*;
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.util.List;
+
import org.apache.jmeter.util.JMeterUtils;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
/************************************************************
* Title: Jakarta-JMeter Description: Copyright: Copyright (c) 2001 Company:
Index: src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java,v
retrieving revision 1.1
diff -u -r1.1 HttpReplyHdr.java
--- src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java 11 Aug
2002 19:24:52 -0000 1.1
+++ src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java 30 Mar
2003 12:15:53 -0000
@@ -4,8 +4,6 @@
***
***/
-import java.net.*;
-import java.io.*;
//
// Class: HttpReplyHdr
Index: src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java,v
retrieving revision 1.10
diff -u -r1.10 ProxyControlGui.java
--- src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
10 Mar 2003 20:10:34 -0000 1.10
+++ src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
30 Mar 2003 12:15:53 -0000
@@ -272,26 +272,26 @@
model = (ProxyControl) createTestElement();
startProxy();
}
- else if (command.equals(this.ADD_EXCLUDE))
+ else if (command.equals(ADD_EXCLUDE))
{
excludeModel.addNewRow();
excludeModel.fireTableDataChanged();
if (stop.isEnabled())
enableRestart();
}
- else if (command.equals(this.ADD_INCLUDE))
+ else if (command.equals(ADD_INCLUDE))
{
includeModel.addNewRow();
includeModel.fireTableDataChanged();
enableRestart();
}
- else if (command.equals(this.DELETE_EXCLUDE))
+ else if (command.equals(DELETE_EXCLUDE))
{
excludeModel.removeRow(excludeTable.getSelectedRow());
excludeModel.fireTableDataChanged();
enableRestart();
}
- else if (command.equals(this.DELETE_INCLUDE))
+ else if (command.equals(DELETE_INCLUDE))
{
includeModel.removeRow(includeTable.getSelectedRow());
includeModel.fireTableDataChanged();
@@ -378,8 +378,8 @@
{
this.setLayout(new GridBagLayout());
GridBagConstraints gbc = new GridBagConstraints();
- gbc.anchor = gbc.WEST;
- gbc.fill = gbc.BOTH;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.fill = GridBagConstraints.BOTH;
gbc.gridheight = 1;
gbc.gridwidth = 1;
gbc.gridx = 0;
@@ -411,13 +411,13 @@
mainPanel.add(createPortPanel(), gbc.clone());
gbc.gridy++;
- gbc.fill = gbc.BOTH;
+ gbc.fill = GridBagConstraints.BOTH;
gbc.weighty = .5;
mainPanel.add(createIncludePanel(), gbc.clone());
gbc.gridy++;
mainPanel.add(createExcludePanel(), gbc.clone());
gbc.gridy++;
- gbc.fill = gbc.NONE;
+ gbc.fill = GridBagConstraints.NONE;
gbc.weighty = 0;
mainPanel.add(createControls(), gbc.clone());
Index: src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFull.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFull.java,v
retrieving revision 1.8
diff -u -r1.8 HTTPSamplerFull.java
--- src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFull.java
14 Jan 2003 01:14:07 -0000 1.8
+++ src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFull.java
30 Mar 2003 12:15:54 -0000
@@ -65,7 +65,6 @@
import java.util.Set;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.apache.jmeter.samplers.Entry;
import org.apache.jmeter.samplers.SampleResult;
Index: src/protocol/http/org/apache/jmeter/protocol/http/sampler/PostWriter.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PostWriter.java,v
retrieving revision 1.5
diff -u -r1.5 PostWriter.java
--- src/protocol/http/org/apache/jmeter/protocol/http/sampler/PostWriter.java 12 Dec
2002 22:00:16 -0000 1.5
+++ src/protocol/http/org/apache/jmeter/protocol/http/sampler/PostWriter.java 30 Mar
2003 12:15:54 -0000
@@ -55,13 +55,20 @@
package org.apache.jmeter.protocol.http.sampler;
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
+import java.net.URLConnection;
+import java.util.Iterator;
-import org.apache.jmeter.protocol.http.config.MultipartUrlConfig;
-import org.apache.jmeter.samplers.Entry;
import org.apache.jmeter.config.Argument;
+import org.apache.jmeter.protocol.http.config.MultipartUrlConfig;
/**
* Title: JMeter
Index:
src/protocol/java/org/apache/jmeter/protocol/java/sampler/AbstractJavaSamplerClient.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/sampler/AbstractJavaSamplerClient.java,v
retrieving revision 1.1
diff -u -r1.1 AbstractJavaSamplerClient.java
---
src/protocol/java/org/apache/jmeter/protocol/java/sampler/AbstractJavaSamplerClient.java
18 Mar 2003 13:41:13 -0000 1.1
+++
src/protocol/java/org/apache/jmeter/protocol/java/sampler/AbstractJavaSamplerClient.java
30 Mar 2003 12:15:54 -0000
@@ -55,7 +55,6 @@
package org.apache.jmeter.protocol.java.sampler;
import org.apache.jmeter.config.Arguments;
-import org.apache.jmeter.samplers.SampleResult;
import org.apache.log.Hierarchy;
import org.apache.log.Logger;
Index:
src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java,v
retrieving revision 1.1
diff -u -r1.1 JavaSamplerContext.java
--- src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java
18 Mar 2003 13:41:13 -0000 1.1
+++ src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java
30 Mar 2003 12:15:54 -0000
@@ -54,11 +54,9 @@
*/
package org.apache.jmeter.protocol.java.sampler;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.apache.jmeter.config.Argument;
import org.apache.jmeter.config.Arguments;
import org.apache.log.Hierarchy;
import org.apache.log.Logger;
Index: src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DbConfig.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DbConfig.java,v
retrieving revision 1.1
diff -u -r1.1 DbConfig.java
--- src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DbConfig.java 11 Aug
2002 19:24:53 -0000 1.1
+++ src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DbConfig.java 30 Mar
2003 12:15:55 -0000
@@ -54,10 +54,10 @@
*/
package org.apache.jmeter.protocol.jdbc.config;
+import java.io.Serializable;
+
import org.apache.jmeter.config.LoginConfig;
-import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.protocol.jdbc.sampler.JDBCSampler;
-import java.io.*;
/**
* Title: JMeter
Index: src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/PoolConfig.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/PoolConfig.java,v
retrieving revision 1.1
diff -u -r1.1 PoolConfig.java
--- src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/PoolConfig.java 11 Aug
2002 19:24:53 -0000 1.1
+++ src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/PoolConfig.java 30 Mar
2003 12:15:55 -0000
@@ -54,10 +54,10 @@
*/
package org.apache.jmeter.protocol.jdbc.config;
-import org.apache.jmeter.config.*;
-import org.apache.jmeter.util.JMeterUtils;
+import java.io.Serializable;
+
+import org.apache.jmeter.config.ConfigTestElement;
import org.apache.jmeter.protocol.jdbc.sampler.JDBCSampler;
-import java.io.*;
/**
Index: src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/SqlConfig.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/SqlConfig.java,v
retrieving revision 1.1
diff -u -r1.1 SqlConfig.java
--- src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/SqlConfig.java 11 Aug
2002 19:24:53 -0000 1.1
+++ src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/SqlConfig.java 30 Mar
2003 12:15:55 -0000
@@ -54,10 +54,10 @@
*/
package org.apache.jmeter.protocol.jdbc.config;
-import org.apache.jmeter.config.*;
-import org.apache.jmeter.util.JMeterUtils;
+import java.io.Serializable;
+
+import org.apache.jmeter.config.ConfigTestElement;
import org.apache.jmeter.protocol.jdbc.sampler.JDBCSampler;
-import java.io.*;
/**
Index: src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java,v
retrieving revision 1.11
diff -u -r1.11 JDBCSampler.java
--- src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java 14 Mar
2003 21:15:37 -0000 1.11
+++ src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java 30 Mar
2003 12:15:55 -0000
@@ -191,7 +191,7 @@
stmt.close();
manager.releaseConnection(con);
res.setResponseData(data.toString().getBytes());
- res.setDataType(res.TEXT);
+ res.setDataType(SampleResult.TEXT);
res.setSuccessful(true);
}
catch (Exception ex)
@@ -253,7 +253,7 @@
public int getMaxUse()
{
- return getPropertyAsInt(this.MAXUSE);
+ return getPropertyAsInt(MAXUSE);
}
public int getNumConnections()--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
