summaryrefslogtreecommitdiffstats
path: root/qadevOOo/runner
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-08-08 14:53:00 +0200
committerNoel Grandin <noel@peralex.com>2014-08-11 12:33:02 +0200
commit41709cc2688738f091a4b17839fe853caa5a0bfd (patch)
tree2e12ca2d594ce6767146c25862869ab7e9d2bc14 /qadevOOo/runner
parentResolves fdo#79278: not too dark, not too bright background color (diff)
downloadcore-41709cc2688738f091a4b17839fe853caa5a0bfd.tar.gz
core-41709cc2688738f091a4b17839fe853caa5a0bfd.zip
java: remove unused parameters
Change-Id: I47c618117e079bb2ef90d92c449c8166ea957fa5
Diffstat (limited to 'qadevOOo/runner')
-rw-r--r--qadevOOo/runner/convwatch/PixelCounter.java5
-rw-r--r--qadevOOo/runner/helper/APIDescGetter.java15
-rw-r--r--qadevOOo/runner/helper/PropertyHandlerImpl.java7
-rw-r--r--qadevOOo/runner/lib/MultiPropertyTest.java6
-rw-r--r--qadevOOo/runner/org/openoffice/RunnerService.java2
-rw-r--r--qadevOOo/runner/stats/FatDataBaseOutProducer.java5
-rw-r--r--qadevOOo/runner/util/AccessibilityTools.java12
-rw-r--r--qadevOOo/runner/util/BasicMacroTools.java7
-rw-r--r--qadevOOo/runner/util/SOfficeFactory.java5
-rw-r--r--qadevOOo/runner/util/UITools.java8
10 files changed, 24 insertions, 48 deletions
diff --git a/qadevOOo/runner/convwatch/PixelCounter.java b/qadevOOo/runner/convwatch/PixelCounter.java
index ef0223a7c1e5..b7723fd779a1 100644
--- a/qadevOOo/runner/convwatch/PixelCounter.java
+++ b/qadevOOo/runner/convwatch/PixelCounter.java
@@ -91,15 +91,10 @@ class graphics_stuff
return 0;
}
- public static void handlesinglepixel(int x, int y, int pixel)
- {
- }
-
public static void countPixel(ImageHelper img, int _x, int _y, int _w, int _h, CountPixel _aPixelCounter)
{
for (int y = 0; y < _h; y++) {
for (int x = 0; x < _w; x++) {
- // handlesinglepixel(x+i, y+j, pixels[j * w + i]);
_aPixelCounter.count(img.getPixel(x,y));
}
}
diff --git a/qadevOOo/runner/helper/APIDescGetter.java b/qadevOOo/runner/helper/APIDescGetter.java
index ef1e7513db73..2e92a5711868 100644
--- a/qadevOOo/runner/helper/APIDescGetter.java
+++ b/qadevOOo/runner/helper/APIDescGetter.java
@@ -259,7 +259,7 @@ public class APIDescGetter extends DescGetter
}
protected static DescEntry[] getSubEntries(BufferedReader cvsFile,
- DescEntry parent, boolean debug)
+ DescEntry parent)
{
String line = "";
String old_ifc_name = "";
@@ -621,7 +621,7 @@ public class APIDescGetter extends DescGetter
theEntry.entryName + "'");
}
- DescEntry[] subEntries = getSubEntries(csvFile, theEntry, debug);
+ DescEntry[] subEntries = getSubEntries(csvFile, theEntry);
theEntry.SubEntryCount = subEntries.length;
theEntry.SubEntries = subEntries;
@@ -708,7 +708,7 @@ public class APIDescGetter extends DescGetter
return setErrorDescription(aEntry, "couldn't find file '" + aUrl + "'");
}
- DescEntry[] subEntries = getSubEntries(csvFile, aEntry, debug);
+ DescEntry[] subEntries = getSubEntries(csvFile, aEntry);
aEntry.SubEntryCount = subEntries.length;
aEntry.SubEntries = subEntries;
@@ -759,7 +759,7 @@ public class APIDescGetter extends DescGetter
System.out.println("## reading from File " + descPath);
}
- scenario = getScenarioFromDirectory(descPath, job, debug);
+ scenario = getScenarioFromDirectory(descPath, job);
}
else
{
@@ -768,14 +768,13 @@ public class APIDescGetter extends DescGetter
System.out.println("## reading from jar");
}
- scenario = getScenarioFromClassPath(job, debug);
+ scenario = getScenarioFromClassPath(job);
}
return scenario;
}
- protected String[] getScenarioFromDirectory(String descPath, String job,
- boolean debug)
+ protected String[] getScenarioFromDirectory(String descPath, String job)
{
String[] modules = null;
ArrayList<String> componentList = new ArrayList<String>();
@@ -829,7 +828,7 @@ public class APIDescGetter extends DescGetter
}
- protected String[] getScenarioFromClassPath(String job, boolean debug)
+ protected String[] getScenarioFromClassPath(String job)
{
String subdir = "/";
diff --git a/qadevOOo/runner/helper/PropertyHandlerImpl.java b/qadevOOo/runner/helper/PropertyHandlerImpl.java
index 873edc4782ed..7fd2fb011e36 100644
--- a/qadevOOo/runner/helper/PropertyHandlerImpl.java
+++ b/qadevOOo/runner/helper/PropertyHandlerImpl.java
@@ -18,7 +18,6 @@
package helper;
import com.sun.star.inspection.LineDescriptor;
-import com.sun.star.inspection.XPropertyControlFactory;
import com.sun.star.inspection.XPropertyHandler;
/**
@@ -236,10 +235,4 @@ public class PropertyHandlerImpl implements XPropertyHandler{
return false;
}
- /**
- * This method currently does nothing
- */
- public void describePropertyLine(String string, LineDescriptor[] lineDescriptor, XPropertyControlFactory xPropertyControlFactory) {
- }
-
}
diff --git a/qadevOOo/runner/lib/MultiPropertyTest.java b/qadevOOo/runner/lib/MultiPropertyTest.java
index 531946d88eb9..a0c93f34896c 100644
--- a/qadevOOo/runner/lib/MultiPropertyTest.java
+++ b/qadevOOo/runner/lib/MultiPropertyTest.java
@@ -447,7 +447,7 @@ public class MultiPropertyTest extends MultiMethodTest
* The method produces new value of the property from the oldValue.
* It returns the result of ValueChanger.changePValue method.
* Subclasses can override the method to return their own value,
- * when the changePValue beahviour is not enough, for example,
+ * when the changePValue behavior is not enough, for example,
* when oldValue is null.
*/
protected Object getNewValue(String propName, Object oldValue)
@@ -459,7 +459,7 @@ public class MultiPropertyTest extends MultiMethodTest
/**
* The method compares obj1 and obj2. It calls
* MultiPropertyTest.compare, but subclasses can override to change
- * the behaviour, since normally compare calls Object.equals method
+ * the behavior, since normally compare calls Object.equals method
* which is not appropriate in some cases(e.g., structs with equals
* not overridden).
*/
@@ -471,7 +471,7 @@ public class MultiPropertyTest extends MultiMethodTest
/**
* The method returns a String representation of the obj. It calls
* MultipropertyTest.toString(Object), but subclasses can override
- * to change the behaviour.
+ * to change the behavior.
*/
protected String toString(Object obj)
{
diff --git a/qadevOOo/runner/org/openoffice/RunnerService.java b/qadevOOo/runner/org/openoffice/RunnerService.java
index 521dff7a30bc..d398f209cba4 100644
--- a/qadevOOo/runner/org/openoffice/RunnerService.java
+++ b/qadevOOo/runner/org/openoffice/RunnerService.java
@@ -59,7 +59,7 @@ public class RunnerService implements XJob, XServiceInfo,
* ct'tor
* Construct an own office provider for tests
*/
- public RunnerService(XMultiServiceFactory xMSF) {
+ public RunnerService() {
}
public Object execute(NamedValue[] args) {
diff --git a/qadevOOo/runner/stats/FatDataBaseOutProducer.java b/qadevOOo/runner/stats/FatDataBaseOutProducer.java
index baa6bb4a4e7a..48fe2062af11 100644
--- a/qadevOOo/runner/stats/FatDataBaseOutProducer.java
+++ b/qadevOOo/runner/stats/FatDataBaseOutProducer.java
@@ -90,11 +90,6 @@ public class FatDataBaseOutProducer extends DataBaseOutProducer {
return true;
}
- // check the database afterwards
- protected boolean checkDataBase(LogWriter log) {
- return true;
- }
-
protected boolean insertEntry(LogWriter log) {
executeSQLCommand("SELECT id AS \"entry.id\", name AS \"entry.name\" FROM entry WHERE name = \"$EntryLongName\";", true);
diff --git a/qadevOOo/runner/util/AccessibilityTools.java b/qadevOOo/runner/util/AccessibilityTools.java
index e13bfcf58c68..a2f0015d1125 100644
--- a/qadevOOo/runner/util/AccessibilityTools.java
+++ b/qadevOOo/runner/util/AccessibilityTools.java
@@ -43,17 +43,15 @@ public class AccessibilityTools {
return UnoRuntime.queryInterface(XAccessible.class, xObject);
}
- public static XWindow getCurrentContainerWindow(XMultiServiceFactory msf,
- XModel xModel) {
- return getWindow(msf, xModel, true);
+ public static XWindow getCurrentContainerWindow(XModel xModel) {
+ return getWindow(xModel, true);
}
- public static XWindow getCurrentWindow(XMultiServiceFactory msf,
- XModel xModel) {
- return getWindow(msf, xModel, false);
+ public static XWindow getCurrentWindow(XModel xModel) {
+ return getWindow(xModel, false);
}
- private static XWindow getWindow(XMultiServiceFactory msf, XModel xModel,
+ private static XWindow getWindow(XModel xModel,
boolean containerWindow) {
XWindow xWindow = null;
diff --git a/qadevOOo/runner/util/BasicMacroTools.java b/qadevOOo/runner/util/BasicMacroTools.java
index 97fb2c53fab2..9d48c946ac97 100644
--- a/qadevOOo/runner/util/BasicMacroTools.java
+++ b/qadevOOo/runner/util/BasicMacroTools.java
@@ -49,7 +49,7 @@ public class BasicMacroTools {
XComponent xDoc) throws java.lang.Exception {
try {
mMSF = msf;
- mDispProv = makeDispatchProvider(mMSF, xModel);
+ mDispProv = makeDispatchProvider(xModel);
mParser = makeParser(mMSF);
Object DocLibCont = null;
@@ -82,7 +82,7 @@ public class BasicMacroTools {
throws java.lang.Exception {
try {
mMSF = msf;
- mDispProv = makeDispatchProvider(mMSF, xModel);
+ mDispProv = makeDispatchProvider(xModel);
mParser = makeParser(mMSF);
Object ASLC = null;
@@ -107,8 +107,7 @@ public class BasicMacroTools {
}
}
- private static XDispatchProvider makeDispatchProvider(XMultiServiceFactory mMSF,
- XModel aModel)
+ private static XDispatchProvider makeDispatchProvider(XModel aModel)
throws java.lang.Exception {
XController xController = aModel.getCurrentController();
XFrame xFrame = xController.getFrame();
diff --git a/qadevOOo/runner/util/SOfficeFactory.java b/qadevOOo/runner/util/SOfficeFactory.java
index 72ca975c540e..dec23a20f8ae 100644
--- a/qadevOOo/runner/util/SOfficeFactory.java
+++ b/qadevOOo/runner/util/SOfficeFactory.java
@@ -215,12 +215,9 @@ public class SOfficeFactory {
*
* @see XChartDocument
*/
- public XChartDocument createChartDoc(String frameName)
+ public XChartDocument createChartDoc()
throws com.sun.star.uno.Exception {
-// XComponent oDoc = loadDocument(
-// util.utils.getFullTestURL("emptyChart.sds"));
-
XComponent oDoc = loadDocument("private:factory/schart");
if (oDoc != null) {
diff --git a/qadevOOo/runner/util/UITools.java b/qadevOOo/runner/util/UITools.java
index db99c090b7ab..0df280360c83 100644
--- a/qadevOOo/runner/util/UITools.java
+++ b/qadevOOo/runner/util/UITools.java
@@ -53,14 +53,14 @@ public class UITools {
public UITools(XMultiServiceFactory msf, XModel xModel)
{
mMSF = msf;
- mXRoot = makeRoot(mMSF, xModel);
+ mXRoot = makeRoot(xModel);
}
public UITools(XMultiServiceFactory msf, XTextDocument xTextDoc)
{
mMSF = msf;
XModel xModel = UnoRuntime.queryInterface(XModel.class, xTextDoc);
- mXRoot = makeRoot(mMSF, xModel);
+ mXRoot = makeRoot(xModel);
}
public UITools(XMultiServiceFactory msf, XWindow xWindow)
@@ -69,9 +69,9 @@ public class UITools {
mXRoot = makeRoot(xWindow);
}
- private static XAccessible makeRoot(XMultiServiceFactory msf, XModel aModel)
+ private static XAccessible makeRoot(XModel aModel)
{
- XWindow xWindow = AccessibilityTools.getCurrentWindow(msf, aModel);
+ XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
return AccessibilityTools.getAccessibleObject(xWindow);
}