summaryrefslogtreecommitdiff
path: root/qadevOOo
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-08-06 08:38:10 +0200
committerNoel Grandin <noel@peralex.com>2014-08-11 12:33:02 +0200
commitd5a31b221510a506a9c43d2c9f44c55405ce13fd (patch)
tree16c4444d46fb439a1601d2d4535e1770da318e05 /qadevOOo
parent41709cc2688738f091a4b17839fe853caa5a0bfd (diff)
java: remove unused parameters
Change-Id: Ifc44c51ddbd21fabaad686bc3d38e2dab54d97aa
Diffstat (limited to 'qadevOOo')
-rw-r--r--qadevOOo/runner/convwatch/ConvWatch.java4
-rw-r--r--qadevOOo/runner/convwatch/ConvWatchStarter.java2
-rw-r--r--qadevOOo/runner/convwatch/HTMLOutputter.java2
-rw-r--r--qadevOOo/runner/convwatch/INIOutputter.java2
-rw-r--r--qadevOOo/runner/convwatch/PRNCompare.java8
-rw-r--r--qadevOOo/runner/convwatch/PixelCounter.java6
-rw-r--r--qadevOOo/runner/graphical/EnhancedComplexTestCase.java4
-rw-r--r--qadevOOo/runner/graphical/PixelCounter.java6
-rw-r--r--qadevOOo/runner/helper/APIDescGetter.java4
-rw-r--r--qadevOOo/runner/helper/CwsDataExchangeImpl.java4
-rw-r--r--qadevOOo/runner/util/AccessibilityTools.java1
-rw-r--r--qadevOOo/runner/util/DBTools.java2
-rw-r--r--qadevOOo/runner/util/db/DataSource.java2
-rw-r--r--qadevOOo/runner/util/db/DatabaseDocument.java3
-rw-r--r--qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java4
-rw-r--r--qadevOOo/tests/java/mod/_dbaccess/ORowSet.java2
-rw-r--r--qadevOOo/tests/java/mod/_forms/GenericModelTest.java2
-rw-r--r--qadevOOo/tests/java/mod/_forms/ODatabaseForm.java2
-rw-r--r--qadevOOo/tests/java/mod/_sw/SwXMailMerge.java4
19 files changed, 29 insertions, 35 deletions
diff --git a/qadevOOo/runner/convwatch/ConvWatch.java b/qadevOOo/runner/convwatch/ConvWatch.java
index 2e089b14c2b7..442a56f40195 100644
--- a/qadevOOo/runner/convwatch/ConvWatch.java
+++ b/qadevOOo/runner/convwatch/ConvWatch.java
@@ -210,7 +210,7 @@ public class ConvWatch
// Status end
String sINIFile = _sFilenamePrefix + sNameNoSuffix + ".ini";
- INIOutputter INIoutput = INIOutputter.create(_sOutputPath, sINIFile, "", "");
+ INIOutputter INIoutput = INIOutputter.create(_sOutputPath, sINIFile, "");
INIoutput.createHeader();
// TODO: version info was fine
@@ -272,7 +272,7 @@ public class ConvWatch
String sNameNoSuffix = FileHelper.getNameNoSuffix(sBasename);
String sINIFile = _sFilenamePrefix + sNameNoSuffix + ".ini";
- INIOutputter INIoutput = INIOutputter.create(_sOutputPath, sINIFile, _sFilenamePrefix, "");
+ INIOutputter INIoutput = INIOutputter.create(_sOutputPath, sINIFile, _sFilenamePrefix);
INIoutput.createHeader();
// LLA? what if the are no values in the list? true or false;
INIoutput.writeSection("global");
diff --git a/qadevOOo/runner/convwatch/ConvWatchStarter.java b/qadevOOo/runner/convwatch/ConvWatchStarter.java
index 2a76f6c53358..b8a0691629e2 100644
--- a/qadevOOo/runner/convwatch/ConvWatchStarter.java
+++ b/qadevOOo/runner/convwatch/ConvWatchStarter.java
@@ -204,7 +204,7 @@ public class ConvWatchStarter extends EnhancedComplexTestCase
sHTMLName = m_sInputPath.substring(n + 1);
sHTMLName += ".html";
}
- HTMLOutputter HTMLoutput = HTMLOutputter.create(m_sOutputPath, sHTMLName, "", "");
+ HTMLOutputter HTMLoutput = HTMLOutputter.create(m_sOutputPath, sHTMLName, "");
HTMLoutput.header( m_sOutputPath );
HTMLoutput.indexSection( m_sOutputPath );
LISTOutputter LISToutput = LISTOutputter.create(m_sOutputPath, "allfiles.txt");
diff --git a/qadevOOo/runner/convwatch/HTMLOutputter.java b/qadevOOo/runner/convwatch/HTMLOutputter.java
index 7d99bda6f0ab..b749169f851a 100644
--- a/qadevOOo/runner/convwatch/HTMLOutputter.java
+++ b/qadevOOo/runner/convwatch/HTMLOutputter.java
@@ -34,7 +34,7 @@ public class HTMLOutputter
String ls;
HTMLOutputter() {}
- public static HTMLOutputter create( String _sOutputPath, String _sHTMLFilename, String _sNamePrefix, String _sTitle )
+ public static HTMLOutputter create( String _sOutputPath, String _sHTMLFilename, String _sNamePrefix )
{
FileHelper.makeDirectories("", _sOutputPath);
HTMLOutputter a = new HTMLOutputter();
diff --git a/qadevOOo/runner/convwatch/INIOutputter.java b/qadevOOo/runner/convwatch/INIOutputter.java
index 3169e42cb3bf..30d6a0d913f7 100644
--- a/qadevOOo/runner/convwatch/INIOutputter.java
+++ b/qadevOOo/runner/convwatch/INIOutputter.java
@@ -32,7 +32,7 @@ public class INIOutputter
*/
String ls;
- public static INIOutputter create( String _sOutputPath, String _sHTMLFilename, String _sNamePrefix, String _sTitle )
+ public static INIOutputter create( String _sOutputPath, String _sHTMLFilename, String _sNamePrefix )
{
FileHelper.makeDirectories("", _sOutputPath);
INIOutputter a = new INIOutputter();
diff --git a/qadevOOo/runner/convwatch/PRNCompare.java b/qadevOOo/runner/convwatch/PRNCompare.java
index 81c426928c47..38955f252004 100644
--- a/qadevOOo/runner/convwatch/PRNCompare.java
+++ b/qadevOOo/runner/convwatch/PRNCompare.java
@@ -149,10 +149,10 @@ public class PRNCompare
String[] aRefList = createJPEGFromPostscript(m_sOutputPath, m_sReferencePath, m_sReferenceFile, getResolutionInDPI());
// TODO: Assume, that Postscript is already in the OutputPath, this may change.
String[] aPSList = createJPEGFromPostscript(m_sOutputPath, m_sOutputPath, m_sPostScriptFile, getResolutionInDPI());
- StatusHelper[] aList = createDiffs(m_sOutputPath,
- aRefList,
+ StatusHelper[] aList = createDiffs(aRefList,
aPSList,
- getMaxPages(), m_tUseBorderMove);
+ getMaxPages(),
+ m_tUseBorderMove);
return aList;
}
@@ -342,7 +342,7 @@ public class PRNCompare
}
- public StatusHelper[] createDiffs(String _sOutputPath, String[] _aRefList, String[] _aPSList, int _nMaxDiffs, TriState _tUseBorderMove)
+ public StatusHelper[] createDiffs(String[] _aRefList, String[] _aPSList, int _nMaxDiffs, TriState _tUseBorderMove)
{
if (_nMaxDiffs < 1)
{
diff --git a/qadevOOo/runner/convwatch/PixelCounter.java b/qadevOOo/runner/convwatch/PixelCounter.java
index b7723fd779a1..36109cc93650 100644
--- a/qadevOOo/runner/convwatch/PixelCounter.java
+++ b/qadevOOo/runner/convwatch/PixelCounter.java
@@ -91,7 +91,7 @@ class graphics_stuff
return 0;
}
- public static void countPixel(ImageHelper img, int _x, int _y, int _w, int _h, CountPixel _aPixelCounter)
+ public static void countPixel(ImageHelper img, int _w, int _h, CountPixel _aPixelCounter)
{
for (int y = 0; y < _h; y++) {
for (int x = 0; x < _w; x++) {
@@ -105,7 +105,7 @@ class graphics_stuff
int h = _aImage.getHeight();
CountPixel aCountNotWhite = new CountNotWhite();
- countPixel(_aImage, 0, 0, w, h, aCountNotWhite);
+ countPixel(_aImage, w, h, aCountNotWhite);
return aCountNotWhite.getCount();
}
@@ -115,7 +115,7 @@ class graphics_stuff
int h = _aImage.getHeight();
CountPixel aCountNotBlack = new CountNotBlack();
- countPixel(_aImage, 0, 0, w, h, aCountNotBlack);
+ countPixel(_aImage, w, h, aCountNotBlack);
return aCountNotBlack.getCount();
}
}
diff --git a/qadevOOo/runner/graphical/EnhancedComplexTestCase.java b/qadevOOo/runner/graphical/EnhancedComplexTestCase.java
index 65a2ce6f8360..0e2be21334b0 100644
--- a/qadevOOo/runner/graphical/EnhancedComplexTestCase.java
+++ b/qadevOOo/runner/graphical/EnhancedComplexTestCase.java
@@ -292,10 +292,6 @@ private void callEntry(String _sEntry, ParameterHelper _aParam)
return "";
}
- public void runThroughOneFileInIndex(String _sPath, String _sBasename, ParameterHelper _aParam)
- {
-
- }
/**
* Run through a given index.ini or run through a given directory,
* find all postscript or pdf files.
diff --git a/qadevOOo/runner/graphical/PixelCounter.java b/qadevOOo/runner/graphical/PixelCounter.java
index 10dab09451d9..0c0fd711d724 100644
--- a/qadevOOo/runner/graphical/PixelCounter.java
+++ b/qadevOOo/runner/graphical/PixelCounter.java
@@ -118,7 +118,7 @@ class CountNotBlack extends CountPixel
class graphics_stuff
{
- public static void countPixel(ImageHelper img, int _x, int _y, int _w, int _h, CountPixel _aPixelCounter)
+ public static void countPixel(ImageHelper img, int _w, int _h, CountPixel _aPixelCounter)
{
for (int y = 0; y < _h; y++) {
for (int x = 0; x < _w; x++) {
@@ -132,7 +132,7 @@ class graphics_stuff
final int h = _aImage.getHeight();
CountPixel aCountNotWhite = new CountNotWhite();
- countPixel(_aImage, 0, 0, w, h, aCountNotWhite);
+ countPixel(_aImage, w, h, aCountNotWhite);
return aCountNotWhite.getCount();
}
@@ -142,7 +142,7 @@ class graphics_stuff
final int h = _aImage.getHeight();
CountPixel aCountNotBlack = new CountNotBlack();
- countPixel(_aImage, 0, 0, w, h, aCountNotBlack);
+ countPixel(_aImage, w, h, aCountNotBlack);
return aCountNotBlack.getCount();
}
}
diff --git a/qadevOOo/runner/helper/APIDescGetter.java b/qadevOOo/runner/helper/APIDescGetter.java
index 2e92a5711868..085f8f2e80cf 100644
--- a/qadevOOo/runner/helper/APIDescGetter.java
+++ b/qadevOOo/runner/helper/APIDescGetter.java
@@ -228,7 +228,7 @@ public class APIDescGetter extends DescGetter
System.out.println("## reading from jar");
}
- entry = getFromClassPath(job, debug);
+ entry = getFromClassPath(job);
}
boolean foundInterface = false;
@@ -515,7 +515,7 @@ public class APIDescGetter extends DescGetter
return entries;
}
- protected DescEntry getFromClassPath(String aEntry, boolean debug)
+ protected DescEntry getFromClassPath(String aEntry)
{
int dotindex = aEntry.indexOf('.');
diff --git a/qadevOOo/runner/helper/CwsDataExchangeImpl.java b/qadevOOo/runner/helper/CwsDataExchangeImpl.java
index 6d3b4eb7c50c..3af899f97dcb 100644
--- a/qadevOOo/runner/helper/CwsDataExchangeImpl.java
+++ b/qadevOOo/runner/helper/CwsDataExchangeImpl.java
@@ -28,7 +28,7 @@ import util.PropertyName;
import util.utils;
/**
- * Implementaion of the interface CwsDataExchange
+ * Implementation of the interface CwsDataExchange
* @see share.CwsDataExchange
*/
public class CwsDataExchangeImpl implements CwsDataExchange
@@ -39,7 +39,7 @@ public class CwsDataExchangeImpl implements CwsDataExchange
private final BuildEnvTools bet;
private final boolean mDebug;
- public CwsDataExchangeImpl(String cwsName, TestParameters param, LogWriter log) throws ParameterNotFoundException
+ public CwsDataExchangeImpl(TestParameters param, LogWriter log) throws ParameterNotFoundException
{
this.param = param;
this.log = log;
diff --git a/qadevOOo/runner/util/AccessibilityTools.java b/qadevOOo/runner/util/AccessibilityTools.java
index a2f0015d1125..3e4553755fa1 100644
--- a/qadevOOo/runner/util/AccessibilityTools.java
+++ b/qadevOOo/runner/util/AccessibilityTools.java
@@ -24,7 +24,6 @@ import com.sun.star.awt.XWindow;
import com.sun.star.frame.XController;
import com.sun.star.frame.XFrame;
import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/runner/util/DBTools.java b/qadevOOo/runner/util/DBTools.java
index 467a9ce6a600..377b6eaa8d56 100644
--- a/qadevOOo/runner/util/DBTools.java
+++ b/qadevOOo/runner/util/DBTools.java
@@ -263,7 +263,7 @@ public class DBTools {
* Creates class instance.
* @param xMSF <code>XMultiServiceFactory</code>.
*/
- public DBTools(XMultiServiceFactory xMSF, PrintWriter _logger )
+ public DBTools(XMultiServiceFactory xMSF )
{
this.xMSF = xMSF ;
try {
diff --git a/qadevOOo/runner/util/db/DataSource.java b/qadevOOo/runner/util/db/DataSource.java
index a03ff4045d8d..eae018a1608b 100644
--- a/qadevOOo/runner/util/db/DataSource.java
+++ b/qadevOOo/runner/util/db/DataSource.java
@@ -70,7 +70,7 @@ public class DataSource
synchronized ( this )
{
if ( m_document == null )
- m_document = new DatabaseDocument( m_orb, this );
+ m_document = new DatabaseDocument( this );
}
return m_document;
}
diff --git a/qadevOOo/runner/util/db/DatabaseDocument.java b/qadevOOo/runner/util/db/DatabaseDocument.java
index f67ad90485e1..d620a8248b70 100644
--- a/qadevOOo/runner/util/db/DatabaseDocument.java
+++ b/qadevOOo/runner/util/db/DatabaseDocument.java
@@ -22,7 +22,6 @@ import com.sun.star.beans.PropertyValue;
import com.sun.star.frame.XModel;
import com.sun.star.frame.XStorable;
import com.sun.star.io.IOException;
-import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.sdb.XDocumentDataSource;
import com.sun.star.sdb.XOfficeDatabaseDocument;
import com.sun.star.uno.UnoRuntime;
@@ -32,7 +31,7 @@ import com.sun.star.uno.UnoRuntime;
*/
public class DatabaseDocument
{
- protected DatabaseDocument( final XMultiServiceFactory _orb, final DataSource _dataSource )
+ protected DatabaseDocument( final DataSource _dataSource )
{
m_dataSource = _dataSource;
diff --git a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java
index 0322f4abc7af..091be8f0f739 100644
--- a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java
+++ b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java
@@ -292,7 +292,7 @@ public class CheckModuleAPI extends ComplexTestCase
{
// cws version: all added modules must be tested
final String cws = version.substring(4, version.length());
- final CwsDataExchangeImpl cde = new CwsDataExchangeImpl(cws, param, log);
+ final CwsDataExchangeImpl cde = new CwsDataExchangeImpl(param, log);
final ArrayList<String> addedModules = cde.getModules();
final ArrayList<String> moduleNames = new ArrayList<String>();
@@ -546,7 +546,7 @@ public class CheckModuleAPI extends ComplexTestCase
// cws version: all added modules must be tested
final String cws = version.substring(4, version.length());
- final CwsDataExchangeImpl cde = new CwsDataExchangeImpl(cws, param, log);
+ final CwsDataExchangeImpl cde = new CwsDataExchangeImpl(param, log);
cde.setUnoApiCwsStatus(status);
}
catch (ParameterNotFoundException ex)
diff --git a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
index 0e0d0e582872..b63b2491fd52 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
@@ -165,7 +165,7 @@ public class ORowSet extends TestCase {
origDB = util.utils.getFullTestDocName("TestDB/testDB.dbf");
- dbTools = new DBTools( m_orb, _log );
+ dbTools = new DBTools( m_orb );
// creating DataSource and registering it in DatabaseContext
String dbURL = (String) Param.get("test.db.url");
diff --git a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
index 8109ae63cee0..5ace649a9690 100644
--- a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
+++ b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
@@ -397,7 +397,7 @@ public class GenericModelTest extends TestCase {
log.println("copy '"+sourceTestDB + "' -> '" + destTestDB + "'");
utils.copyFile(xMSF, sourceTestDB, destTestDB);
- m_dbTools = new DBTools( xMSF, log );
+ m_dbTools = new DBTools( xMSF );
String tmpDir = utils.getOfficeTemp((xMSF));
m_srcInf = m_dbTools.newDataSourceInfo();
diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
index 8f42343a2b4a..26be61c77b0c 100644
--- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
+++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
@@ -233,7 +233,7 @@ public class ODatabaseForm extends TestCase {
origDB = util.utils.getFullTestDocName("TestDB/testDB.dbf");
- dbTools = new DBTools( tParam.getMSF(), log );
+ dbTools = new DBTools( tParam.getMSF() );
// creating DataSource and registering it in DatabaseContext
String dbURL = (String) tParam.get("test.db.url");
diff --git a/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java b/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java
index cfd35362d233..9855b6b2991c 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java
@@ -329,7 +329,7 @@ public class SwXMailMerge extends TestCase {
xSrcProp.setPropertyValue("URL", tmpDatabaseUrl) ;
- DBTools dbt = new DBTools( Param.getMSF(), log );
+ DBTools dbt = new DBTools( Param.getMSF() );
// registering source in DatabaseContext
log.println("register database '"+tmpDatabaseUrl+"' as '"+databaseName+"'" );
dbt.reRegisterDB(databaseName, newSource) ;
@@ -388,7 +388,7 @@ public class SwXMailMerge extends TestCase {
protected void cleanup(TestParameters Param, PrintWriter log) {
log.println("closing connections...");
XMultiServiceFactory xMsf = Param.getMSF();
- DBTools dbt = new DBTools( xMsf, log );
+ DBTools dbt = new DBTools( xMsf );
if (Param.containsKey("uniqueSuffix")){
int uniqueSuffix = Param.getInt("uniqueSuffix");