Author: sebb
Date: Sat Aug 15 10:45:00 2009
New Revision: 804452
URL: http://svn.apache.org/viewvc?rev=804452&view=rev
Log:
Fix up some raw types
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/RandomOrderController.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Arguments.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/FunctionParser.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/ValueReplacer.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/GUIFactory.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java?rev=804452&r1=804451&r2=804452&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java
Sat Aug 15 10:45:00 2009
@@ -98,7 +98,7 @@
}
private void setNodePath() {
- List nodePath = new ArrayList();
+ List<String> nodePath = new ArrayList<String>();
if (selectedNode != null) {
TreeNode[] path = selectedNode.getPath();
for (int i = 0; i < path.length; i++) {
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/RandomOrderController.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/RandomOrderController.java?rev=804452&r1=804451&r2=804452&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/RandomOrderController.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/RandomOrderController.java
Sat Aug 15 10:45:00 2009
@@ -21,6 +21,8 @@
import java.util.Iterator;
import java.util.List;
+import org.apache.jmeter.testelement.TestElement;
+
/**
* A controller that runs its children each at most once, but in a random
order.
*
@@ -57,13 +59,13 @@
int numElements = this.subControllersAndSamplers.size();
// Create a new list containing numElements null elements.
- List reordered = new ArrayList(this.subControllersAndSamplers.size());
+ List<TestElement> reordered = new
ArrayList<TestElement>(this.subControllersAndSamplers.size());
for (int i = 0; i < numElements; i++) {
reordered.add(null);
}
// Insert the subControllersAndSamplers into random list positions.
- for (Iterator i = this.subControllersAndSamplers.iterator();
i.hasNext();) {
+ for (Iterator<TestElement> i =
this.subControllersAndSamplers.iterator(); i.hasNext();) {
int idx = (int) Math.floor(Math.random() * reordered.size());
while (true) {
if (idx == numElements) {
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=804452&r1=804451&r2=804452&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Sat Aug 15
10:45:00 2009
@@ -547,11 +547,11 @@
// Process command line property definitions
// These can potentially occur multiple times
- List clOptions = parser.getArguments();
+ List<CLOption> clOptions = parser.getArguments();
int size = clOptions.size();
for (int i = 0; i < size; i++) {
- CLOption option = (CLOption) clOptions.get(i);
+ CLOption option = clOptions.get(i);
String name = option.getArgument(0);
String value = option.getArgument(1);
FileInputStream fis = null;
@@ -756,7 +756,7 @@
}
}
- List engines = new LinkedList();
+ List<JMeterEngine> engines = new LinkedList<JMeterEngine>();
tree.add(tree.getArray()[0], new ListenToTest(parent, (remoteStart
&& remoteStop) ? engines : null));
println("Created the tree successfully using "+testFile);
JMeterEngine engine = null;
@@ -777,9 +777,9 @@
println("Starting remote engines");
long now=System.currentTimeMillis();
println("Starting the test @ "+new Date(now)+" ("+now+")");
- Iterator iter = engines.iterator();
+ Iterator<JMeterEngine> iter = engines.iterator();
while (iter.hasNext()) {
- engine = (JMeterEngine) iter.next();
+ engine = iter.next();
if (engine != null){
engine.runTest();
}
@@ -891,9 +891,9 @@
//NOT YET USED private JMeter _parent;
- private List engines;
+ private List<JMeterEngine> engines;
- public ListenToTest(JMeter parent, List engines) {
+ public ListenToTest(JMeter parent, List<JMeterEngine> engines) {
//_parent = parent;
this.engines=engines;
}
@@ -942,9 +942,9 @@
*/
if (engines!=null){ // it will be null unless remoteStop = true
System.out.println("Exitting remote servers");
- Iterator it = engines.iterator();
+ Iterator<JMeterEngine> it = engines.iterator();
while(it.hasNext()){
- JMeterEngine e = (JMeterEngine) it.next();
+ JMeterEngine e = it.next();
e.exit();
}
}
@@ -997,7 +997,7 @@
}
log.info("Loaded icon properties from " + iconProp);
String[][] iconlist = new String[p.size()][3];
- Enumeration pe = p.keys();
+ Enumeration<?> pe = p.keys();
int i = 0;
while (pe.hasMoreElements()) {
String key = (String) pe.nextElement();
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java?rev=804452&r1=804451&r2=804452&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java Sat Aug 15
10:45:00 2009
@@ -50,7 +50,7 @@
private static final String jmDir;
static {
- List jars = new LinkedList();
+ List<URL> jars = new LinkedList<URL>();
final String initial_classpath = System.getProperty(JAVA_CLASS_PATH);
// Find JMeter home dir from the initial classpath
@@ -120,7 +120,7 @@
// ClassFinder needs the classpath
System.setProperty(JAVA_CLASS_PATH, initial_classpath +
classpath.toString());
- loader = new DynamicClassLoader((URL[]) jars.toArray(new URL[0]));
+ loader = new DynamicClassLoader(jars.toArray(new URL[0]));
}
/**
@@ -196,7 +196,7 @@
}
try {
- Class initialClass;
+ Class<?> initialClass;
if (args != null && args.length > 0 && args[0].equals("report"))
{// $NON-NLS-1$
initialClass =
loader.loadClass("org.apache.jmeter.JMeterReport");// $NON-NLS-1$
} else {
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Arguments.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Arguments.java?rev=804452&r1=804451&r2=804452&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Arguments.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Arguments.java Sat
Aug 15 10:45:00 2009
@@ -77,9 +77,9 @@
*
* @return a new Map with String keys and values containing the arguments
*/
- public Map getArgumentsAsMap() {
+ public Map<String, String> getArgumentsAsMap() {
PropertyIterator iter = getArguments().iterator();
- Map argMap = new LinkedHashMap();
+ Map<String, String> argMap = new LinkedHashMap<String, String>();
while (iter.hasNext()) {
Argument arg = (Argument) iter.next().getObjectValue();
// Because CollectionProperty.mergeIn will not prevent adding two
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java?rev=804452&r1=804451&r2=804452&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
Sat Aug 15 10:45:00 2009
@@ -46,14 +46,16 @@
*/
public class GenericController extends AbstractTestElement implements
Controller, Serializable {
- private static final long serialVersionUID = 233L;
+ private static final long serialVersionUID = 234L;
private static final Logger log = LoggingManager.getLoggerForClass();
- private transient LinkedList iterationListeners = new LinkedList();
+ private transient LinkedList<LoopIterationListener> iterationListeners =
+ new LinkedList<LoopIterationListener>();
// May be replaced by RandomOrderController
- protected transient List subControllersAndSamplers = new ArrayList();
+ protected transient List<TestElement> subControllersAndSamplers =
+ new ArrayList<TestElement>();
protected transient int current;
@@ -74,7 +76,7 @@
first = true; // TODO should this use setFirst()?
TestElement elem;
for (int i = 0; i < subControllersAndSamplers.size(); i++) {
- elem = (TestElement) subControllersAndSamplers.get(i);
+ elem = subControllersAndSamplers.get(i);
if (elem instanceof Controller) {
((Controller) elem).initialize();
}
@@ -232,7 +234,7 @@
*
* @return the SubControllers value
*/
- protected List getSubControllers() {
+ protected List<TestElement> getSubControllers() {
return subControllersAndSamplers;
}
@@ -263,7 +265,7 @@
*/
protected TestElement getCurrentElement() throws NextIsNullException {
if (current < subControllersAndSamplers.size()) {
- return (TestElement) subControllersAndSamplers.get(current);
+ return subControllersAndSamplers.get(current);
}
if (subControllersAndSamplers.size() == 0) {
setDone(true);
@@ -312,10 +314,10 @@
}
protected void fireIterationStart() {
- Iterator iter = iterationListeners.iterator();
+ Iterator<LoopIterationListener> iter = iterationListeners.iterator();
LoopIterationEvent event = new LoopIterationEvent(this,
getIterCount());
while (iter.hasNext()) {
- LoopIterationListener item = (LoopIterationListener) iter.next();
+ LoopIterationListener item = iter.next();
item.iterationStart(event);
}
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/FunctionParser.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/FunctionParser.java?rev=804452&r1=804451&r2=804452&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/FunctionParser.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/FunctionParser.java
Sat Aug 15 10:45:00 2009
@@ -50,11 +50,11 @@
*
* @param value string containing the function / variable references (if
any)
*
- * @return list of strings or Objects representing functions
+ * @return list of Strings or Objects representing functions
*/
- LinkedList compileString(String value) throws InvalidVariableException {
+ LinkedList<Object> compileString(String value) throws
InvalidVariableException {
StringReader reader = new StringReader(value);
- LinkedList result = new LinkedList();
+ LinkedList<Object> result = new LinkedList<Object>();
StringBuffer buffer = new StringBuffer();
char previous = ' '; // TODO - why use space?
char[] current = new char[1];
@@ -149,7 +149,7 @@
} else if (current[0] == '}') {// variable, or function with
no parameter list
function =
CompoundVariable.getNamedFunction(buffer.toString());
if (function instanceof Function){// ensure that
setParameters() is called.
- ((Function) function).setParameters(new LinkedList());
+ ((Function) function).setParameters(new
LinkedList<CompoundVariable>());
}
buffer.setLength(0);
return function;
@@ -177,9 +177,10 @@
* <li></li>
* </ul>
* @param reader a StringReader pointing to the current input location,
just after "("
+ * @return a list of CompoundVariable elements
*/
- LinkedList parseParams(StringReader reader) throws
InvalidVariableException {
- LinkedList result = new LinkedList();
+ LinkedList<CompoundVariable> parseParams(StringReader reader) throws
InvalidVariableException {
+ LinkedList<CompoundVariable> result = new
LinkedList<CompoundVariable>();
StringBuffer buffer = new StringBuffer();
char[] current = new char[1];
char previous = ' ';
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/ValueReplacer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/ValueReplacer.java?rev=804452&r1=804451&r2=804452&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/ValueReplacer.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/ValueReplacer.java
Sat Aug 15 10:45:00 2009
@@ -43,7 +43,7 @@
private final CompoundVariable masterFunction = new CompoundVariable();
- private Map variables = new HashMap();
+ private Map<String, String> variables = new HashMap<String, String>();
public ValueReplacer() {
}
@@ -55,7 +55,8 @@
boolean containsKey(String k){
return variables.containsKey(k);
}
- public void setUserDefinedVariables(Map variables) {
+
+ public void setUserDefinedVariables(Map<String, String> variables) {
this.variables = variables;
}
@@ -101,7 +102,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);
}
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/GUIFactory.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/GUIFactory.java?rev=804452&r1=804451&r2=804452&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/GUIFactory.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/GUIFactory.java Sat Aug
15 10:45:00 2009
@@ -31,14 +31,14 @@
*
*/
public final class GUIFactory {
- /** A Map from String to JComponent of registered GUI classes. */
- private static final Map GUI_MAP = new HashMap();
+ /** A Map from String to JMeterGUIComponent of registered GUI classes. */
+ private static final Map<String, JMeterGUIComponent> GUI_MAP = new
HashMap<String, JMeterGUIComponent>();
/** A Map from String to ImageIcon of registered icons. */
- private static final Map ICON_MAP = new HashMap();
+ private static final Map<String, ImageIcon> ICON_MAP = new HashMap<String,
ImageIcon>();
/** A Map from String to ImageIcon of registered icons. */
- private static final Map DISABLED_ICON_MAP = new HashMap();
+ private static final Map<String, ImageIcon> DISABLED_ICON_MAP = new
HashMap<String, ImageIcon>();
/**
* Prevent instantiation since this is a static utility class.
@@ -55,7 +55,7 @@
* @return the associated icon, or null if this class or its superclass has
* not been registered
*/
- public static ImageIcon getIcon(Class elementClass) {
+ public static ImageIcon getIcon(Class<?> elementClass) {
return getIcon(elementClass, true);
}
@@ -72,9 +72,9 @@
* @return the associated icon, or null if this class or its superclass has
* not been registered
*/
- public static ImageIcon getIcon(Class elementClass, boolean enabled) {
+ public static ImageIcon getIcon(Class<?> elementClass, boolean enabled) {
String key = elementClass.getName();
- ImageIcon icon = (ImageIcon) (enabled ? ICON_MAP.get(key) :
DISABLED_ICON_MAP.get(key));
+ ImageIcon icon = (enabled ? ICON_MAP.get(key) :
DISABLED_ICON_MAP.get(key));
if (icon != null) {
return icon;
@@ -97,7 +97,7 @@
* @return an instance of the class, or null if this class or its
superclass
* has not been registered
*/
- public static JComponent getGUI(Class elementClass) {
+ public static JComponent getGUI(Class<?> elementClass) {
// TODO: This method doesn't appear to be used.
String key = elementClass.getName();
JComponent gui = (JComponent) GUI_MAP.get(key);
@@ -159,7 +159,7 @@
* if access rights do not permit an instance of the GUI class
* to be created
*/
- public static void registerGUI(String key, Class guiClass, Class
testClass) throws InstantiationException,
+ public static void registerGUI(String key, Class<?> guiClass, Class<?>
testClass) throws InstantiationException,
IllegalAccessException {
// TODO: This method doesn't appear to be used.
JMeterGUIComponent gui;
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java?rev=804452&r1=804451&r2=804452&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java
(original)
+++ jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java
Sat Aug 15 10:45:00 2009
@@ -44,11 +44,9 @@
public class Data implements Serializable {
private static final Logger log = LoggingManager.getLoggerForClass();
- private Map data;
+ private final Map<String, List<Object>> data;
- // Map iterators = new HashMap();
- // Hashtable dataLine;
- private ArrayList header;
+ private ArrayList<String> header;
// saves current position in data Vector
private int currentPos, size;
@@ -57,8 +55,8 @@
* Constructor - takes no arguments.
*/
public Data() {
- header = new ArrayList();
- data = new HashMap();
+ header = new ArrayList<String>();
+ data = new HashMap<String, List<Object>>();
currentPos = -1;
size = currentPos + 1;
}
@@ -72,10 +70,10 @@
* New header name.
*/
public void replaceHeader(String oldHeader, String newHeader) {
- List tempList;
+ List<Object> tempList;
int index = header.indexOf(oldHeader);
header.set(index, newHeader);
- tempList = (List) data.remove(oldHeader);
+ tempList = data.remove(oldHeader);
data.put(newHeader, tempList);
}
@@ -123,13 +121,13 @@
* Removes the current row.
*/
public void removeRow() {
- List tempList;
- Iterator it = data.keySet().iterator();
+ List<Object> tempList;
+ Iterator<String> it = data.keySet().iterator();
log.debug("removing row, size = " + size);
if (currentPos > -1 && currentPos < size) {
log.debug("got to here");
while (it.hasNext()) {
- tempList = (List) data.get(it.next());
+ tempList = data.get(it.next());
tempList.remove(currentPos);
}
if (currentPos > 0) {
@@ -150,10 +148,10 @@
public void addRow() {
String[] headers = getHeaders();
- List tempList = new ArrayList();
+ List<Object> tempList = new ArrayList<Object>();
for (int i = 0; i < headers.length; i++) {
- if ((tempList = (ArrayList) data.get(header.get(i))) == null) {
- tempList = new ArrayList();
+ if ((tempList = data.get(header.get(i))) == null) {
+ tempList = new ArrayList<Object>();
data.put(headers[i], tempList);
}
tempList.add("");
@@ -189,11 +187,11 @@
}
private void swapRows(int row1, int row2) {
- List temp;
+ List<Object> temp;
Object o;
- Iterator it = data.keySet().iterator();
+ Iterator<String> it = data.keySet().iterator();
while (it.hasNext()) {
- temp = (List) data.get(it.next());
+ temp = data.get(it.next());
o = temp.get(row1);
temp.set(row1, temp.get(row2));
temp.set(row2, o);
@@ -213,17 +211,17 @@
*/
private void sortData(String column, int start, int end) {
int x = start, y = end - 1;
- String basis = ((List) data.get(column)).get((x + y) / 2).toString();
+ String basis = ((List<?>) data.get(column)).get((x + y) /
2).toString();
if (x == y) {
return;
}
while (x <= y) {
- while (x < end && ((List)
data.get(column)).get(x).toString().compareTo(basis) < 0) {
+ while (x < end && ((List<?>)
data.get(column)).get(x).toString().compareTo(basis) < 0) {
x++;
}
- while (y >= (start - 1) && ((List)
data.get(column)).get(y).toString().compareTo(basis) > 0) {
+ while (y >= (start - 1) && ((List<?>)
data.get(column)).get(y).toString().compareTo(basis) > 0) {
y--;
}
@@ -268,9 +266,9 @@
* value to set into column.
*/
public void addColumnValue(String column, Object value) {
- ArrayList tempList;
- if ((tempList = (ArrayList) data.get(column)) == null) {
- tempList = new ArrayList();
+ ArrayList<Object> tempList;
+ if ((tempList = (ArrayList<Object>) data.get(column)) == null) {
+ tempList = new ArrayList<Object>();
data.put(column, tempList);
}
int s = tempList.size();
@@ -304,10 +302,7 @@
* @return row # where value exists.
*/
public int findValue(String column, Object value) {
- List list = (List) data.get(column);
- int ret = -1;
- ret = list.indexOf(value);
- return ret;
+ return data.get(column).indexOf(value);
}
/**
@@ -320,9 +315,9 @@
* value to set into column.
*/
public void setColumnValue(String column, Object value) {
- List tempList;
- if ((tempList = (List) data.get(column)) == null) {
- tempList = new ArrayList();
+ List<Object> tempList;
+ if ((tempList = data.get(column)) == null) {
+ tempList = new ArrayList<Object>();
data.put(column, tempList);
}
@@ -419,7 +414,7 @@
public Object getColumnValue(String column) {
try {
if (currentPos < size) {
- return ((List) data.get(column)).get(currentPos);
+ return ((List<?>) data.get(column)).get(currentPos);
} else {
return null;
}
@@ -436,10 +431,10 @@
* @return an Object which holds the value of the column.
*/
public Object getColumnValue(int column) {
- String columnName = (String) header.get(column);
+ String columnName = header.get(column);
try {
if (currentPos < size) {
- return ((List) data.get(columnName)).get(currentPos);
+ return ((List<?>) data.get(columnName)).get(currentPos);
} else {
return null;
}
@@ -454,7 +449,7 @@
}
public void removeColumn(int col) {
- String columnName = (String) header.get(col);
+ String columnName = header.get(col);
data.remove(columnName);
header.remove(columnName);
}
@@ -470,10 +465,10 @@
*/
public void setHeaders(String[] h) {
int x = 0;
- header = new ArrayList(h.length);
+ header = new ArrayList<String>(h.length);
for (x = 0; x < h.length; x++) {
header.add(h[x]);
- data.put(h[x], new ArrayList());
+ data.put(h[x], new ArrayList<Object>());
}
}
@@ -485,7 +480,7 @@
public String[] getHeaders() {
String[] r = new String[header.size()];
if (r.length > 0) {
- r = (String[]) header.toArray(r);
+ r = header.toArray(r);
}
return r;
}
@@ -502,8 +497,8 @@
* name of the column.
* @return array of Objects representing the data.
*/
- public List getColumnAsObjectArray(String columnName) {
- return (List) data.get(columnName);
+ public List<Object> getColumnAsObjectArray(String columnName) {
+ return data.get(columnName);
}
/**
@@ -518,10 +513,10 @@
public String[] getColumn(String columnName) {
String[] returnValue;
Object o;
- List temp = (List) data.get(columnName);
+ List<?> temp = data.get(columnName);
if (temp != null) {
returnValue = new String[temp.size()];
- Iterator it = temp.iterator();
+ Iterator<?> it = temp.iterator();
int index = 0;
while (it.hasNext()) {
o = it.next();
@@ -573,16 +568,16 @@
* Sets the data for every row in the column.
*/
public void setColumnData(String colName, Object value) {
- List list = this.getColumnAsObjectArray(colName);
+ List<Object> list = this.getColumnAsObjectArray(colName);
while (list.size() < size()) {
list.add(value);
}
}
- public void setColumnData(int col, List data) {
+ public void setColumnData(int col, List<?> data) {
reset();
- Iterator iter = data.iterator();
- String columnName = (String) header.get(col);
+ Iterator<?> iter = data.iterator();
+ String columnName = header.get(col);
while (iter.hasNext()) {
next();
setColumnValue(columnName, iter.next());
@@ -597,7 +592,7 @@
*/
public void addHeader(String s) {
header.add(s);
- data.put(s, new ArrayList(Math.max(size(), 100)));
+ data.put(s, new ArrayList<Object>(Math.max(size(), 100)));
}
/**
@@ -609,10 +604,10 @@
* array of strings representing column values.
*/
public void setLine(String[] line) {
- List tempList;
+ List<Object> tempList;
String[] h = getHeaders();
for (int count = 0; count < h.length; count++) {
- tempList = (List) data.get(h[count]);
+ tempList = data.get(h[count]);
if (count < line.length && line[count].length() > 0) {
tempList.add(line[count]);
} else {
@@ -634,10 +629,10 @@
* headers.
*/
public void setLine(String[] line, String deflt) {
- List tempList;
+ List<Object> tempList;
String[] h = getHeaders();
for (int count = 0; count < h.length; count++) {
- tempList = (List) data.get(h[count]);
+ tempList = data.get(h[count]);
if (count < line.length && line[count].length() > 0) {
tempList.add(line[count]);
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
