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 se...@apache.org on 2009/09/01 15:41:59 UTC
svn commit: r810036 - in /jakarta/jmeter/trunk:
src/jorphan/org/apache/jorphan/math/
src/monitor/components/org/apache/jmeter/monitor/util/
src/monitor/model/org/apache/jmeter/monitor/model/
src/protocol/http/org/apache/jmeter/protocol/http/control/ sr...
Author: sebb
Date: Tue Sep 1 13:41:58 2009
New Revision: 810036
URL: http://svn.apache.org/viewvc?rev=810036&view=rev
Log:
Generics fixes
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/NumberComparator.java
jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/monitor/util/Stats.java
jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/JvmImpl.java
jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Status.java
jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/StatusImpl.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterModifier.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLContentHandler.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLParser.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserSequence.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/monitor/model/TestObjectFactory.java
Modified: jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/NumberComparator.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/NumberComparator.java?rev=810036&r1=810035&r2=810036&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/NumberComparator.java (original)
+++ jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/NumberComparator.java Tue Sep 1 13:41:58 2009
@@ -23,23 +23,14 @@
import java.util.Comparator;
-public class NumberComparator implements Comparator {
+public class NumberComparator implements Comparator<Number[]> {
- /**
- *
- */
public NumberComparator() {
super();
}
- /*
- * (non-Javadoc)
- *
- * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
- */
- public int compare(Object val1, Object val2) {
- Number[] n1 = (Number[]) val1;
- Number[] n2 = (Number[]) val2;
+ /** {@inheritDoc} */
+ public int compare(Number[] n1, Number[] n2) {
if (n1[0].longValue() < n2[0].longValue()) {
return -1;
} else if (n1[0].longValue() == n2[0].longValue()) {
Modified: jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/monitor/util/Stats.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/monitor/util/Stats.java?rev=810036&r1=810035&r2=810036&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/monitor/util/Stats.java (original)
+++ jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/monitor/util/Stats.java Tue Sep 1 13:41:58 2009
@@ -177,14 +177,14 @@
if (connectorPrefix != null && connectorPrefix.length() > 0) {
// loop to fetch desired connector
for (int i = 0; i < stat.getConnector().size(); i++) {
- cntr = (Connector) stat.getConnector().get(i);
+ cntr = stat.getConnector().get(i);
if (cntr.getName().startsWith(connectorPrefix)) {
return cntr;
}
}
}
// default : get first connector
- cntr = (Connector) stat.getConnector().get(0);
+ cntr = stat.getConnector().get(0);
return cntr;
}
Modified: jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/JvmImpl.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/JvmImpl.java?rev=810036&r1=810035&r2=810036&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/JvmImpl.java (original)
+++ jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/JvmImpl.java Tue Sep 1 13:41:58 2009
@@ -30,15 +30,12 @@
super();
}
+ /** {@inheritDoc} */
public Memory getMemory() {
return this.memory;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.monitor.model.Jvm#setMemory(org.apache.jmeter.monitor.model.Memory)
- */
+ /** {@inheritDoc} */
public void setMemory(Memory mem) {
this.memory = mem;
}
Modified: jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Status.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Status.java?rev=810036&r1=810035&r2=810036&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Status.java (original)
+++ jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Status.java Tue Sep 1 13:41:58 2009
@@ -21,7 +21,7 @@
void setJvm(Jvm vm);
- java.util.List getConnector();
+ java.util.List<Connector> getConnector();
void addConnector(Connector conn);
Modified: jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/StatusImpl.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/StatusImpl.java?rev=810036&r1=810035&r2=810036&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/StatusImpl.java (original)
+++ jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/StatusImpl.java Tue Sep 1 13:41:58 2009
@@ -28,40 +28,28 @@
private String connectorPrefix = null;
- private final List connectors;
+ private final List<Connector> connectors;
/**
*
*/
public StatusImpl() {
super();
- connectors = new LinkedList();
+ connectors = new LinkedList<Connector>();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.monitor.model.Status#getJvm()
- */
+ /** {@inheritDoc} */
public Jvm getJvm() {
return jvm;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.monitor.model.Status#setJvm(org.apache.jmeter.monitor.model.Jvm)
- */
+ /** {@inheritDoc} */
public void setJvm(Jvm vm) {
this.jvm = vm;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.monitor.model.Status#getConnector()
- */
- public List getConnector() {
+ /** {@inheritDoc} */
+ public List<Connector> getConnector() {
return this.connectors;
}
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java?rev=810036&r1=810035&r2=810036&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java Tue Sep 1 13:41:58 2009
@@ -124,10 +124,6 @@
return true;
}
- public Class<?> getGuiClass() {
- return org.apache.jmeter.protocol.http.gui.AuthPanel.class;
- }
-
/**
* Return the record at index i
*/
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterModifier.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterModifier.java?rev=810036&r1=810035&r2=810036&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterModifier.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterModifier.java Tue Sep 1 13:41:58 2009
@@ -64,7 +64,7 @@
*/
public void testStarted() {
// try to populate allUsers, if fail, leave as any empty set
- List allUsers = new LinkedList();
+ List<Map<String, String>> allUsers = new LinkedList<Map<String, String>>();
try {
UserParameterXMLParser readXMLParameters = new UserParameterXMLParser();
allUsers = readXMLParameters.getXMLParameters(getXmlUri());
@@ -103,7 +103,7 @@
return;
}
HTTPSamplerBase config = (HTTPSamplerBase) entry;
- Map currentUser = allAvailableUsers.getNextUserMods();
+ Map<String, String> currentUser = allAvailableUsers.getNextUserMods();
PropertyIterator iter = config.getArguments().iterator();
while (iter.hasNext()) {
Argument arg = (Argument) iter.next().getObjectValue();
@@ -111,7 +111,7 @@
// then change its value
// (Note: each jmeter thread (ie user) gets to have unique values)
if (currentUser.containsKey(arg.getName())) {
- arg.setValue((String) currentUser.get(arg.getName()));
+ arg.setValue(currentUser.get(arg.getName()));
}
}
}
@@ -144,19 +144,11 @@
setProperty(XMLURI, xmlURI);
}
- /*
- * (non-Javadoc)
- *
- * @see TestListener#testIterationStart(LoopIterationEvent)
- */
+ /** {@inheritDoc} */
public void testIterationStart(LoopIterationEvent event) {
}
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#clone()
- */
+ /** {@inheritDoc} */
@Override
public Object clone() {
UserParameterModifier clone = (UserParameterModifier) super.clone();
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLContentHandler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLContentHandler.java?rev=810036&r1=810035&r2=810036&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLContentHandler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLContentHandler.java Tue Sep 1 13:41:58 2009
@@ -41,13 +41,13 @@
// Note UserParameterXML accesses this variable
// to obtain the Set data via method getParsedParameters()
- private List userThreads = new LinkedList();
+ private List<Map<String, String>> userThreads = new LinkedList<Map<String, String>>();
private String paramname = "";
private String paramvalue = "";
- private Map nameValuePair = new HashMap();
+ private Map<String, String> nameValuePair = new HashMap<String, String>();
/** Buffer for collecting data from the "characters" SAX event. */
private CharArrayWriter contents = new CharArrayWriter();
@@ -88,7 +88,7 @@
// must create a new object,
// or else end up with a set full of the same Map object
if (qName.equals("thread")) {
- nameValuePair = new HashMap();
+ nameValuePair = new HashMap<String, String>();
}
}
@@ -130,7 +130,7 @@
*
* @return all users name value pairs obtained from XML file
*/
- public List getParsedParameters() {
+ public List<Map<String, String>> getParsedParameters() {
return userThreads;
}
}
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLParser.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLParser.java?rev=810036&r1=810035&r2=810036&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLParser.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLParser.java Tue Sep 1 13:41:58 2009
@@ -20,6 +20,7 @@
import java.io.IOException;
import java.util.List;
+import java.util.Map;
import org.apache.jmeter.util.JMeterUtils;
import org.xml.sax.InputSource;
@@ -43,7 +44,7 @@
* name of the XML to load users parameter data
* @return all users name value pairs obtained from XML file
*/
- public List getXMLParameters(String xmlURI) throws SAXException, IOException {
+ public List<Map<String, String>> getXMLParameters(String xmlURI) throws SAXException, IOException {
// create instances needed for parsing
XMLReader reader = JMeterUtils.getXMLParser();
// XMLReaderFactory.createXMLReader(vendorParseClass);
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserSequence.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserSequence.java?rev=810036&r1=810035&r2=810036&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserSequence.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserSequence.java Tue Sep 1 13:41:58 2009
@@ -41,9 +41,9 @@
// -------------------------------------------
// Constants and Data Members
// -------------------------------------------
- private List allUsers;
+ private List<Map<String, String>> allUsers;
- private transient Iterator indexOfUsers;
+ private transient Iterator<Map<String, String>> indexOfUsers;
// -------------------------------------------
// Constructors
@@ -58,7 +58,7 @@
* ie a Set of Mapped "parameter names and parameter values" for each user
* to be loaded into the sequencer.
*/
- public UserSequence(List allUsers) {
+ public UserSequence(List<Map<String, String>> allUsers) {
this.allUsers = allUsers;
// initalise pointer to first user
@@ -75,19 +75,19 @@
* @return a Map object of parameter names and matching parameter values for
* the next user
*/
- public synchronized Map getNextUserMods() {
+ public synchronized Map<String, String> getNextUserMods() {
// Use round robin allocation of user details
if (!indexOfUsers.hasNext()) {
indexOfUsers = allUsers.iterator();
}
- Map user;
+ Map<String, String> user;
if (indexOfUsers.hasNext()) {
- user = (Map) indexOfUsers.next();
+ user = indexOfUsers.next();
log.debug("UserSequence.getNextuserMods(): current parameters will be " + "changed to: " + user);
} else {
// no entries in all users, therefore create an empty Map object
- user = new HashMap();
+ user = new HashMap<String, String>();
}
return user;
Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/monitor/model/TestObjectFactory.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/monitor/model/TestObjectFactory.java?rev=810036&r1=810035&r2=810036&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/monitor/model/TestObjectFactory.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/monitor/model/TestObjectFactory.java Tue Sep 1 13:41:58 2009
@@ -64,7 +64,7 @@
System.out.println(st.getJvm().getMemory().getTotal());
System.out.println(st.getJvm().getMemory().getMax());
System.out.println("connector size: " + st.getConnector().size());
- Connector conn = (Connector) st.getConnector().get(0);
+ Connector conn = st.getConnector().get(0);
System.out.println("conn: " + conn.getThreadInfo().getMaxThreads());
}
} catch (java.io.FileNotFoundException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org