Author: sebb Date: Mon Aug 17 22:06:50 2009 New Revision: 805173 URL: http://svn.apache.org/viewvc?rev=805173&view=rev Log: Fix up some raw types
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Workers.java jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkersImpl.java jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/engine/ValueReplacer.java Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java?rev=805173&r1=805172&r2=805173&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java (original) +++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java Mon Aug 17 22:06:50 2009 @@ -111,7 +111,7 @@ if (threadValues.size() > 0) { return (CollectionProperty) threadValues.get(getThreadContext().getThreadNum() % threadValues.size()); } - return new CollectionProperty("noname", new LinkedList()); + return new CollectionProperty("noname", new LinkedList<Object>()); } public boolean isPerIteration() { Modified: jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Workers.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Workers.java?rev=805173&r1=805172&r2=805173&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Workers.java (original) +++ jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Workers.java Mon Aug 17 22:06:50 2009 @@ -17,10 +17,13 @@ package org.apache.jmeter.monitor.model; +import java.util.List; + /** * @version $Revision$ */ public interface Workers { - java.util.List getWorker(); + + List<Worker> getWorker(); } Modified: jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkersImpl.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkersImpl.java?rev=805173&r1=805172&r2=805173&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkersImpl.java (original) +++ jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkersImpl.java Mon Aug 17 22:06:50 2009 @@ -24,17 +24,17 @@ * @version $Revision$ */ public class WorkersImpl implements Workers { - private List worker = null; + private final List<Worker> worker; /** * */ public WorkersImpl() { super(); - worker = new LinkedList(); + worker = new LinkedList<Worker>(); } - public List getWorker() { + public List<Worker> getWorker() { return worker; } Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java?rev=805173&r1=805172&r2=805173&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java (original) +++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java Mon Aug 17 22:06:50 2009 @@ -99,10 +99,10 @@ @Override public TestElement createTestElement() { stopTableEditing(); - Iterator modelData = tableModel.iterator(); + Iterator<HTTPArgument> modelData = (Iterator<HTTPArgument>) tableModel.iterator(); Arguments args = new Arguments(); while (modelData.hasNext()) { - HTTPArgument arg = (HTTPArgument) modelData.next(); + HTTPArgument arg = modelData.next(); args.addArgument(arg); } this.configureTestElement(args); Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/engine/ValueReplacer.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/engine/ValueReplacer.java?rev=805173&r1=805172&r2=805173&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/engine/ValueReplacer.java (original) +++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/engine/ValueReplacer.java Mon Aug 17 22:06:50 2009 @@ -28,7 +28,7 @@ public class ValueReplacer { // private static final Logger log = LoggingManager.getLoggerForClass(); - Map variables = new HashMap(); + private Map<String, String> variables = new HashMap<String, String>(); public ValueReplacer() { } @@ -37,7 +37,7 @@ setUserDefinedVariables(tp.getUserDefinedVariables()); } - public void setUserDefinedVariables(Map variables) { + public void setUserDefinedVariables(Map<String, String> variables) { this.variables = variables; } @@ -103,7 +103,7 @@ * @param vars * A map of variable name-value pairs (String-to-String). */ - public void addVariables(Map vars) { + public void addVariables(Map<String, String> vars) { variables.putAll(vars); } --------------------------------------------------------------------- To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org