From 453d7edc424d6652e209ace4915d96193a79be71 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 27 Jun 2012 16:08:28 +0200 Subject: Java5 update - convert more code to use generics:wq Change-Id: I7ea32cad40a6657e4e5886d04af008cb6d67ac6e --- qadevOOo/runner/stats/ComplexDataBaseOutProducer.java | 2 +- qadevOOo/runner/stats/DataBaseOutProducer.java | 8 ++++---- qadevOOo/runner/stats/FatDataBaseOutProducer.java | 2 +- qadevOOo/runner/stats/FileLogWriter.java | 2 +- qadevOOo/runner/stats/OutProducerFactory.java | 6 +++--- qadevOOo/runner/stats/SQLExecution.java | 14 +++++++------- qadevOOo/runner/stats/SimpleLogWriter.java | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) (limited to 'qadevOOo/runner/stats') diff --git a/qadevOOo/runner/stats/ComplexDataBaseOutProducer.java b/qadevOOo/runner/stats/ComplexDataBaseOutProducer.java index a64e6f3cbc35..386ec11ca844 100644 --- a/qadevOOo/runner/stats/ComplexDataBaseOutProducer.java +++ b/qadevOOo/runner/stats/ComplexDataBaseOutProducer.java @@ -30,7 +30,7 @@ import java.util.GregorianCalendar; public class ComplexDataBaseOutProducer extends DataBaseOutProducer { /** Creates a new instance of ComplexDataBaseOutProducer */ - public ComplexDataBaseOutProducer(HashMap param) { + public ComplexDataBaseOutProducer(HashMap param) { super(param); // do we have to write debug output? Object o = param.get("DebugIsActive"); diff --git a/qadevOOo/runner/stats/DataBaseOutProducer.java b/qadevOOo/runner/stats/DataBaseOutProducer.java index 08e44d369b66..046440465196 100644 --- a/qadevOOo/runner/stats/DataBaseOutProducer.java +++ b/qadevOOo/runner/stats/DataBaseOutProducer.java @@ -27,7 +27,7 @@ import java.util.HashMap; * @author sg128468 */ public abstract class DataBaseOutProducer implements LogWriter { - protected HashMap mSqlInput = null; + protected HashMap mSqlInput = null; protected HashMap mSqlOutput = null; protected String[] mWriteableEntryTypes = null; protected SQLExecution mSqlExec; @@ -37,8 +37,8 @@ public abstract class DataBaseOutProducer implements LogWriter { /** Creates a new instance of DataBaseOutProducer * @param param The HashMap with test parameters */ - public DataBaseOutProducer(HashMap param) { - mSqlInput = new HashMap(); + public DataBaseOutProducer(HashMap param) { + mSqlInput = new HashMap(); mSqlInput.putAll(param); Object o = param.get("DebugIsActive"); @@ -119,7 +119,7 @@ public abstract class DataBaseOutProducer implements LogWriter { */ protected boolean insertEntry(DescEntry entry, LogWriter log) { // copy the swlInput HashMap, so it can be reset easily for the next run - HashMap copySqlInput = new HashMap(); + HashMap copySqlInput = new HashMap(); copySqlInput.putAll(mSqlInput); // put some stuff from entry in the HashMap mSqlInput.put("EntryLongName", entry.longName); diff --git a/qadevOOo/runner/stats/FatDataBaseOutProducer.java b/qadevOOo/runner/stats/FatDataBaseOutProducer.java index 88981f738247..baa6bb4a4e7a 100644 --- a/qadevOOo/runner/stats/FatDataBaseOutProducer.java +++ b/qadevOOo/runner/stats/FatDataBaseOutProducer.java @@ -31,7 +31,7 @@ public class FatDataBaseOutProducer extends DataBaseOutProducer { /** Creates a new instance of APIDataBaseOutProducer */ - public FatDataBaseOutProducer(HashMap param) { + public FatDataBaseOutProducer(HashMap param) { super(param); String testBase = (String)mSqlInput.get("TestBase"); int sep = testBase.indexOf('_'); diff --git a/qadevOOo/runner/stats/FileLogWriter.java b/qadevOOo/runner/stats/FileLogWriter.java index b8e545351ce6..953814f16687 100644 --- a/qadevOOo/runner/stats/FileLogWriter.java +++ b/qadevOOo/runner/stats/FileLogWriter.java @@ -126,7 +126,7 @@ public class FileLogWriter extends PrintWriter implements LogWriter { } public void setWatcher(Object watcher) { - entry.UserDefinedParams.put("Watcher", (share.Watcher) watcher); + entry.UserDefinedParams.put("Watcher", watcher); } } diff --git a/qadevOOo/runner/stats/OutProducerFactory.java b/qadevOOo/runner/stats/OutProducerFactory.java index ffdac13b37a6..b5c95da36b66 100644 --- a/qadevOOo/runner/stats/OutProducerFactory.java +++ b/qadevOOo/runner/stats/OutProducerFactory.java @@ -36,7 +36,7 @@ public class OutProducerFactory { * @param Parameters of the test. * @return The created out producer. */ - public static LogWriter createOutProducer(HashMap param) { + public static LogWriter createOutProducer(HashMap param) { LogWriter dbOut = null; boolean getDatabase = convertToBool(param.get("DataBaseOut")); if (getDatabase) { @@ -65,7 +65,7 @@ public class OutProducerFactory { * @param The test parameters * @return The database out producer, or null if it couldn't be created. */ - public static LogWriter createDataBaseOutProducer(HashMap param) { + public static LogWriter createDataBaseOutProducer(HashMap param) { String dataProducerName = (String)param.get("DataBaseOutProducer"); if (dataProducerName == null) { String testBaseName = (String)param.get("TestBase"); @@ -77,7 +77,7 @@ public class OutProducerFactory { LogWriter dbOut = null; try { dbOut = (LogWriter)dcl.getInstance(dataProducerName, - new Class[]{new HashMap().getClass()}, new Object[]{param}); + new Class[]{HashMap.class}, new Object[]{param}); } catch(IllegalArgumentException e) { e.printStackTrace(); diff --git a/qadevOOo/runner/stats/SQLExecution.java b/qadevOOo/runner/stats/SQLExecution.java index 21d0cbeecf86..3253415bd490 100644 --- a/qadevOOo/runner/stats/SQLExecution.java +++ b/qadevOOo/runner/stats/SQLExecution.java @@ -125,7 +125,7 @@ public class SQLExecution { * @param sqlOutput The results of the command are put in this HashMap. * @return True, if no error occurred. */ - public boolean executeSQLCommand(String command, HashMap sqlInput, HashMap sqlOutput) + public boolean executeSQLCommand(String command, HashMap sqlInput, HashMap sqlOutput) throws IllegalArgumentException { return executeSQLCommand(command, sqlInput, sqlOutput, false); } @@ -139,7 +139,7 @@ public class SQLExecution { * sqlInput HashMap. * @return True, if no error occurred. */ - public boolean executeSQLCommand(String command, HashMap sqlInput, HashMap sqlOutput, boolean mergeOutputIntoInput) + public boolean executeSQLCommand(String command, HashMap sqlInput, HashMap sqlOutput, boolean mergeOutputIntoInput) throws IllegalArgumentException { if (sqlOutput == null) { sqlOutput = new HashMap(); @@ -193,11 +193,11 @@ public class SQLExecution { // add the values if (addNewVals && i!=0) { // all values until now were of type String, not String[], so now new values have to be added. - sqlCommand.add(i, (String)sqlCommand.get(0) + " " + pre + value + post); + sqlCommand.add(i, sqlCommand.get(0) + " " + pre + value + post); } else { // we already have vals.length commands (or are at the first command), so just add. - sqlCommand.set(i, (String)sqlCommand.get(i) + " " + pre + value + post); + sqlCommand.set(i, sqlCommand.get(i) + " " + pre + value + post); } } } @@ -205,7 +205,7 @@ public class SQLExecution { // value is a String: no other possibility String value = checkForQuotationMarks((String)sqlInput.get(key)); for (int i=0; i keys = sqlOutput.keySet().iterator(); diff --git a/qadevOOo/runner/stats/SimpleLogWriter.java b/qadevOOo/runner/stats/SimpleLogWriter.java index 043cf342cb54..3d3164373fbf 100644 --- a/qadevOOo/runner/stats/SimpleLogWriter.java +++ b/qadevOOo/runner/stats/SimpleLogWriter.java @@ -96,7 +96,7 @@ public class SimpleLogWriter extends PrintWriter implements LogWriter { { if (watcher != null) { - entry.UserDefinedParams.put("Watcher", (share.Watcher) watcher); + entry.UserDefinedParams.put("Watcher", watcher); } } } -- cgit