Author: sebb
Date: Sun Aug 16 10:56:45 2009
New Revision: 804660
URL: http://svn.apache.org/viewvc?rev=804660&view=rev
Log:
Fix up some raw types
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListener.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListenerImpl.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/ConversionHelp.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=804660&r1=804659&r2=804660&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Sun Aug 16
10:56:45 2009
@@ -800,7 +800,7 @@
* @param tree
*/
public static void convertSubTree(HashTree tree) {
- Iterator<?> iter = new LinkedList(tree.list()).iterator();
+ Iterator<Object> iter = new LinkedList<Object>(tree.list()).iterator();
while (iter.hasNext()) {
Object o = iter.next();
if (o instanceof TestElement) {
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java?rev=804660&r1=804659&r2=804660&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
Sun Aug 16 10:56:45 2009
@@ -415,7 +415,7 @@
test.traverse(new TurnElementsOn());
if (startListenersLater) { notifyTestListenersOfStart(testListeners); }
- List testLevelElements = new LinkedList(test.list(test.getArray()[0]));
+ List<?> testLevelElements = new
LinkedList<Object>(test.list(test.getArray()[0]));
removeThreadGroups(testLevelElements);
SearchByClass searcher = new SearchByClass(ThreadGroup.class);
test.traverse(searcher);
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java?rev=804660&r1=804659&r2=804660&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java
Sun Aug 16 10:56:45 2009
@@ -156,7 +156,7 @@
public CompoundVariable getFunction() {
CompoundVariable func = new CompoundVariable();
- func.compiledComponents = (LinkedList) compiledComponents.clone();
+ func.compiledComponents = (LinkedList<Object>)
compiledComponents.clone();
func.rawParameters = rawParameters;
return func;
}
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java?rev=804660&r1=804659&r2=804660&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java Sun
Aug 16 10:56:45 2009
@@ -105,7 +105,7 @@
}
private static void cloneChildren(JMeterTreeNode to, JMeterTreeNode from) {
- Enumeration enumFrom = from.children();
+ Enumeration<?> enumFrom = from.children();
while (enumFrom.hasMoreElements()) {
JMeterTreeNode child = (JMeterTreeNode) enumFrom.nextElement();
JMeterTreeNode childClone = (JMeterTreeNode) child.clone();
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListener.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListener.java?rev=804660&r1=804659&r2=804660&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListener.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListener.java
Sun Aug 16 10:56:45 2009
@@ -46,7 +46,7 @@
* the list of sample events to be fired locally.
* @throws RemoteException
*/
- public void processBatch(List samples) throws RemoteException;
+ public void processBatch(List<SampleEvent> samples) throws RemoteException;
/**
* A sample has started and stopped.
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListenerImpl.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListenerImpl.java?rev=804660&r1=804659&r2=804660&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListenerImpl.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListenerImpl.java
Sun Aug 16 10:56:45 2009
@@ -87,11 +87,11 @@
* @param samples
* the list of sample events to be fired locally
*/
- public void processBatch(List samples) {
+ public void processBatch(List<SampleEvent> samples) {
if (samples != null) {
- Iterator iter = samples.iterator();
+ Iterator<SampleEvent> iter = samples.iterator();
while (iter.hasNext()) {
- SampleEvent e = (SampleEvent) iter.next();
+ SampleEvent e = iter.next();
sampleOccurred(e);
}
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/ConversionHelp.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/ConversionHelp.java?rev=804660&r1=804659&r2=804660&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/ConversionHelp.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/ConversionHelp.java
Sun Aug 16 10:56:45 2009
@@ -123,7 +123,7 @@
}
// Names of properties that are handled specially
- private static final Map propertyToAttribute=new HashMap();
+ private static final Map<String, String> propertyToAttribute=new
HashMap<String, String>();
private static void mapentry(String prop, String att){
propertyToAttribute.put(prop,att);
@@ -139,12 +139,12 @@
private static void saveClass(TestElement el, HierarchicalStreamWriter
writer, String prop){
String clazz=el.getPropertyAsString(prop);
if (clazz.length()>0) {
-
writer.addAttribute((String)propertyToAttribute.get(prop),SaveService.classToAlias(clazz));
+
writer.addAttribute(propertyToAttribute.get(prop),SaveService.classToAlias(clazz));
}
}
private static void restoreClass(TestElement el, HierarchicalStreamReader
reader, String prop) {
- String att=(String) propertyToAttribute.get(prop);
+ String att=propertyToAttribute.get(prop);
String alias=reader.getAttribute(att);
if (alias!=null){
el.setProperty(prop,SaveService.aliasToClass(alias));
@@ -158,13 +158,13 @@
if (encode) {
item=ConversionHelp.encode(item);
}
- writer.addAttribute((String)propertyToAttribute.get(prop),item);
+ writer.addAttribute(propertyToAttribute.get(prop),item);
}
}
private static void restoreItem(TestElement el, HierarchicalStreamReader
reader, String prop,
boolean decode) {
- String att=(String) propertyToAttribute.get(prop);
+ String att=propertyToAttribute.get(prop);
String value=reader.getAttribute(att);
if (value!=null){
if (decode) {
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
