summaryrefslogtreecommitdiff
path: root/qadevOOo
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-08-08 12:44:57 +0200
committerNoel Grandin <noel@peralex.com>2014-08-13 08:49:23 +0200
commit68cd011c907d00493bf2bfde531c1e244819596b (patch)
tree0225318c908b00faaa701a19aaf7aa567c3582a0 /qadevOOo
parent70f56bc22fe952c75ec714e05e1bb5296491a36a (diff)
java: reduce scope, make some methods private
found by UCDetector Change-Id: Ib1425edde146193a65c242dc159b7e3fbf0e4a2e
Diffstat (limited to 'qadevOOo')
-rw-r--r--qadevOOo/runner/complexlib/Assurance.java6
-rw-r--r--qadevOOo/runner/convwatch/BorderRemover.java6
-rw-r--r--qadevOOo/runner/convwatch/ConvWatch.java8
-rw-r--r--qadevOOo/runner/convwatch/DB.java2
-rw-r--r--qadevOOo/runner/convwatch/DBHelper.java2
-rw-r--r--qadevOOo/runner/convwatch/DirectoryHelper.java4
-rw-r--r--qadevOOo/runner/convwatch/EnhancedComplexTestCase.java4
-rw-r--r--qadevOOo/runner/convwatch/FileHelper.java4
-rw-r--r--qadevOOo/runner/convwatch/FilenameHelper.java10
-rw-r--r--qadevOOo/runner/convwatch/GraphicalTestArguments.java8
-rw-r--r--qadevOOo/runner/convwatch/HTMLOutputter.java8
-rw-r--r--qadevOOo/runner/convwatch/INIOutputter.java2
-rw-r--r--qadevOOo/runner/convwatch/IniFile.java20
-rw-r--r--qadevOOo/runner/convwatch/MSOfficePrint.java22
-rw-r--r--qadevOOo/runner/convwatch/OfficePrint.java24
-rw-r--r--qadevOOo/runner/convwatch/PRNCompare.java18
-rw-r--r--qadevOOo/runner/convwatch/PerformanceContainer.java4
-rw-r--r--qadevOOo/runner/convwatch/PixelCounter.java6
-rw-r--r--qadevOOo/runner/convwatch/ReferenceBuilder.java4
-rw-r--r--qadevOOo/runner/convwatch/TriState.java2
-rw-r--r--qadevOOo/runner/graphical/DateHelper.java2
-rw-r--r--qadevOOo/runner/graphical/DirectoryHelper.java4
-rw-r--r--qadevOOo/runner/graphical/FileHelper.java6
-rw-r--r--qadevOOo/runner/graphical/IniFile.java2
-rw-r--r--qadevOOo/runner/graphical/JPEGCreator.java6
-rw-r--r--qadevOOo/runner/graphical/MSOfficePostscriptCreator.java18
-rw-r--r--qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java8
-rw-r--r--qadevOOo/runner/graphical/PerformanceContainer.java4
-rw-r--r--qadevOOo/runner/graphical/PixelCounter.java6
-rw-r--r--qadevOOo/runner/helper/APIDescGetter.java22
-rw-r--r--qadevOOo/runner/helper/CfgParser.java4
-rw-r--r--qadevOOo/runner/helper/ClParser.java4
-rw-r--r--qadevOOo/runner/helper/ConfigHelper.java6
-rw-r--r--qadevOOo/runner/helper/OfficeProvider.java10
-rw-r--r--qadevOOo/runner/helper/OfficeWatcher.java4
-rw-r--r--qadevOOo/runner/helper/ProcessHandler.java12
-rw-r--r--qadevOOo/runner/helper/StringHelper.java4
-rw-r--r--qadevOOo/runner/helper/URLHelper.java2
-rw-r--r--qadevOOo/runner/lib/Parameters.java2
-rw-r--r--qadevOOo/runner/org/openoffice/Runner.java4
-rw-r--r--qadevOOo/runner/stats/DataBaseOutProducer.java6
-rw-r--r--qadevOOo/runner/stats/OutProducerFactory.java4
-rw-r--r--qadevOOo/runner/util/AccessibilityTools.java6
-rw-r--r--qadevOOo/runner/util/CalcTools.java2
-rw-r--r--qadevOOo/runner/util/DBTools.java16
-rw-r--r--qadevOOo/runner/util/DesktopTools.java4
-rw-r--r--qadevOOo/runner/util/DrawTools.java2
-rw-r--r--qadevOOo/runner/util/DynamicClassLoader.java2
-rw-r--r--qadevOOo/runner/util/FormTools.java2
-rw-r--r--qadevOOo/runner/util/RegistryTools.java6
-rw-r--r--qadevOOo/runner/util/SOfficeFactory.java2
-rw-r--r--qadevOOo/runner/util/UITools.java2
-rw-r--r--qadevOOo/runner/util/ValueComparer.java16
-rw-r--r--qadevOOo/runner/util/WriterTools.java2
-rw-r--r--qadevOOo/runner/util/XMLTools.java12
-rw-r--r--qadevOOo/runner/util/compare/GraphicalComparator.java4
-rw-r--r--qadevOOo/runner/util/dbg.java10
-rw-r--r--qadevOOo/runner/util/utils.java6
58 files changed, 199 insertions, 199 deletions
diff --git a/qadevOOo/runner/complexlib/Assurance.java b/qadevOOo/runner/complexlib/Assurance.java
index 6c5a41931d96..74fad940051f 100644
--- a/qadevOOo/runner/complexlib/Assurance.java
+++ b/qadevOOo/runner/complexlib/Assurance.java
@@ -256,7 +256,7 @@ public class Assurance
* @param _expectedExceptionClass is the class of the exception to be caught. If this is null,
* it means that <em>no</em> exception must be throw by invoking the method.
*/
- protected void assureException( final String _message, final Object _object, final String _methodName,
+ private void assureException( final String _message, final Object _object, final String _methodName,
final Class<?>[] _argClasses, final Object[] _methodArgs, final Class<?> _expectedExceptionClass )
{
Class<?> objectClass = _object.getClass();
@@ -292,7 +292,7 @@ public class Assurance
* @param _expectedExceptionClass is the class of the exception to be caught. If this is null,
* it means that <em>no</em> exception must be throw by invoking the method.
*/
- protected void assureException( final String _message, final Object _object, final String _methodName,
+ private void assureException( final String _message, final Object _object, final String _methodName,
final Object[] _methodArgs, final Class<?> _expectedExceptionClass )
{
Class<?>[] argClasses = new Class[ _methodArgs.length ];
@@ -375,7 +375,7 @@ public class Assurance
}
}
- protected void assureEquals( String message, Object expected, Object actual, boolean cont ) {
+ private void assureEquals( String message, Object expected, Object actual, boolean cont ) {
assure( message + " (expected: " + expected.toString() + ", actual: " + actual.toString() + ")",
expected.equals( actual ), cont );
}
diff --git a/qadevOOo/runner/convwatch/BorderRemover.java b/qadevOOo/runner/convwatch/BorderRemover.java
index e1f75a22122e..26b61be9ec66 100644
--- a/qadevOOo/runner/convwatch/BorderRemover.java
+++ b/qadevOOo/runner/convwatch/BorderRemover.java
@@ -60,7 +60,7 @@ class BorderRemover
* @param _nTolerance is a percentage value how strong the colors could be differ
*/
- boolean compareColorWithTolerance(int _nColor1, int _nColor2, int _nTolerance)
+ private boolean compareColorWithTolerance(int _nColor1, int _nColor2, int _nTolerance)
{
// int alpha1 = (_nColor1 >> 24) & 0xff;
int red1 = (_nColor1 >> 16) & 0xff;
@@ -179,7 +179,7 @@ class BorderRemover
* as result it fills the m_nXMin, m_nXMax, m_nYMin, m_nYMax values.
*/
- Rect findBorder(ImageHelper _aImage, int _nBorderColor)
+ private Rect findBorder(ImageHelper _aImage, int _nBorderColor)
{
int h = _aImage.getHeight();
int w = _aImage.getWidth();
@@ -233,7 +233,7 @@ class BorderRemover
return aRect;
}
- RenderedImage createImage(ImageHelper _aImage, Rect _aRect) throws IllegalArgumentException
+ private RenderedImage createImage(ImageHelper _aImage, Rect _aRect) throws IllegalArgumentException
{
// TODO: throw if w or h < 0
int w = _aRect.getWidth();
diff --git a/qadevOOo/runner/convwatch/ConvWatch.java b/qadevOOo/runner/convwatch/ConvWatch.java
index 442a56f40195..d64de0543c12 100644
--- a/qadevOOo/runner/convwatch/ConvWatch.java
+++ b/qadevOOo/runner/convwatch/ConvWatch.java
@@ -30,7 +30,7 @@ import java.io.File;
public class ConvWatch
{
- String getBuildID_FromFile(String _sInfoFile)
+ private String getBuildID_FromFile(String _sInfoFile)
{
String sBuildID = "";
IniFile aIniFile = new IniFile(_sInfoFile);
@@ -57,7 +57,7 @@ public class ConvWatch
* It's also absolutlly impossible to say, how much time this functions consume.
*/
- StatusHelper[] createPostscriptStartCheck(GraphicalTestArguments _aGTA,
+ private StatusHelper[] createPostscriptStartCheck(GraphicalTestArguments _aGTA,
String _sOutputPath, String _sAbsoluteInputFile, String _sAbsoluteReferenceFile)
throws ConvWatchCancelException
{
@@ -200,7 +200,7 @@ public class ConvWatch
// This creates a status for exact on document
- static boolean createINIStatus(StatusHelper[] aList, String _sFilenamePrefix, String _sOutputPath, String _sAbsoluteInputFile, String _sBuildID, String _sRefBuildID)
+ private static boolean createINIStatus(StatusHelper[] aList, String _sFilenamePrefix, String _sOutputPath, String _sAbsoluteInputFile, String _sBuildID, String _sRefBuildID)
{
System.getProperty("file.separator");
String sBasename = FileHelper.getBasename(_sAbsoluteInputFile);
@@ -265,7 +265,7 @@ public class ConvWatch
- static void createINIStatus_DiffDiff(StatusHelper[] aDiffDiffList, String _sFilenamePrefix, String _sOutputPath, String _sAbsoluteInputFile, String _sBuildID)
+ private static void createINIStatus_DiffDiff(StatusHelper[] aDiffDiffList, String _sFilenamePrefix, String _sOutputPath, String _sAbsoluteInputFile, String _sBuildID)
{
System.getProperty("file.separator");
String sBasename = FileHelper.getBasename(_sAbsoluteInputFile);
diff --git a/qadevOOo/runner/convwatch/DB.java b/qadevOOo/runner/convwatch/DB.java
index 30ec9b36d7d7..23f258e0bcbe 100644
--- a/qadevOOo/runner/convwatch/DB.java
+++ b/qadevOOo/runner/convwatch/DB.java
@@ -209,7 +209,7 @@ public class DB extends DBHelper
System.out.println("UUID: " + sUUID);
}
- public ArrayList<String> QuerySQL(Connection _aCon, String _sSQL)
+ private ArrayList<String> QuerySQL(Connection _aCon, String _sSQL)
{
java.sql.Statement oStmt = null;
ArrayList<String> aResultList = new ArrayList<String>();
diff --git a/qadevOOo/runner/convwatch/DBHelper.java b/qadevOOo/runner/convwatch/DBHelper.java
index f94e7274ce57..12b2651613b0 100644
--- a/qadevOOo/runner/convwatch/DBHelper.java
+++ b/qadevOOo/runner/convwatch/DBHelper.java
@@ -182,7 +182,7 @@ public class DBHelper
return null;
}
- protected synchronized void ExecSQL(Connection _aCon, String _sSQL)
+ private synchronized void ExecSQL(Connection _aCon, String _sSQL)
{
MySQLThread aSQLThread = new MySQLThread(_aCon, _sSQL);
aSQLThread.start();
diff --git a/qadevOOo/runner/convwatch/DirectoryHelper.java b/qadevOOo/runner/convwatch/DirectoryHelper.java
index 02a81d94d7df..ac0b94de12c7 100644
--- a/qadevOOo/runner/convwatch/DirectoryHelper.java
+++ b/qadevOOo/runner/convwatch/DirectoryHelper.java
@@ -30,7 +30,7 @@ public class DirectoryHelper
private ArrayList<String> m_aFileList = new ArrayList<String>();
private boolean m_bRecursiveIsAllowed = true;
- void setRecursiveIsAllowed(boolean _bValue)
+ private void setRecursiveIsAllowed(boolean _bValue)
{
m_bRecursiveIsAllowed = _bValue;
}
@@ -79,7 +79,7 @@ public class DirectoryHelper
return a.m_aFileList.toArray();
}
- void traverse_impl( String afileDirectory, FileFilter _aFileFilter )
+ private void traverse_impl( String afileDirectory, FileFilter _aFileFilter )
{
File fileDirectory = new File(afileDirectory);
// Testing, if the file is a directory, and if so, it throws an exception
diff --git a/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java b/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java
index a53a48b38e8e..9792d6f4ef70 100644
--- a/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java
+++ b/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java
@@ -28,7 +28,7 @@ import convwatch.GraphicalTestArguments;
public abstract class EnhancedComplexTestCase extends ComplexTestCase
{
- void checkExistance(String _sScriptFile, String _sName)
+ private void checkExistance(String _sScriptFile, String _sName)
{
// Process testshl = Runtime.getRuntime().exec(scriptFile);
ProcessHandler aHandler = new ProcessHandler(_sScriptFile);
@@ -71,7 +71,7 @@ public abstract class EnhancedComplexTestCase extends ComplexTestCase
protected abstract Object[] mustInstalledSoftware();
- public boolean needCheckForInstalledSoftware()
+ private boolean needCheckForInstalledSoftware()
{
String sNEEDCHECK = (String)param.get( PropertyName.CHECK_NEED_TOOLS );
// TODO: I need to get the boolean value with get("name") because, if it is not given getBool() returns
diff --git a/qadevOOo/runner/convwatch/FileHelper.java b/qadevOOo/runner/convwatch/FileHelper.java
index 5ae392128204..221be5fa74be 100644
--- a/qadevOOo/runner/convwatch/FileHelper.java
+++ b/qadevOOo/runner/convwatch/FileHelper.java
@@ -168,7 +168,7 @@ public class FileHelper
makeDirectories(first, path, "0777");
}
- public static void makeDirectories(String first, String path, String _sMode)
+ private static void makeDirectories(String first, String path, String _sMode)
{
String fs = System.getProperty("file.separator");
if (path.startsWith(fs + fs)) // starts with UNC Path
@@ -205,7 +205,7 @@ public class FileHelper
// return;
}
- public static void chmod(File file, String mode) throws java.io.IOException
+ private static void chmod(File file, String mode) throws java.io.IOException
{
Runtime.getRuntime().exec
(new String[]
diff --git a/qadevOOo/runner/convwatch/FilenameHelper.java b/qadevOOo/runner/convwatch/FilenameHelper.java
index c26e8ee99921..9d2919fcaf95 100644
--- a/qadevOOo/runner/convwatch/FilenameHelper.java
+++ b/qadevOOo/runner/convwatch/FilenameHelper.java
@@ -193,7 +193,7 @@ abstract class FilenameHelper_impl implements Filenamer
/**
* @return the complete name. Without convert the path separator!
*/
- String createAbsoluteFilename()
+ private String createAbsoluteFilename()
{
return m_sPath + fs + getFilename();
}
@@ -201,7 +201,7 @@ abstract class FilenameHelper_impl implements Filenamer
/*
* remove follows 'file separators'
*/
- String checkPath(String _sPath)
+ private String checkPath(String _sPath)
{
String sPath;
if (_sPath.endsWith("/") || _sPath.endsWith("\\"))
@@ -215,7 +215,7 @@ abstract class FilenameHelper_impl implements Filenamer
return sPath;
}
- String checkFilename(String _sFilename)
+ private String checkFilename(String _sFilename)
{
String sFilename;
if (_sFilename.startsWith("/") || _sFilename.startsWith("\\"))
@@ -229,7 +229,7 @@ abstract class FilenameHelper_impl implements Filenamer
return sFilename;
}
- String checkSuffix(String _sSuffix)
+ private String checkSuffix(String _sSuffix)
{
String sSuffix;
if (_sSuffix.startsWith("."))
@@ -243,7 +243,7 @@ abstract class FilenameHelper_impl implements Filenamer
return sSuffix;
}
- String splitSuffix(String _sName)
+ private String splitSuffix(String _sName)
{
String sSuffix = FileHelper.getSuffix(_sName);
return checkSuffix(sSuffix);
diff --git a/qadevOOo/runner/convwatch/GraphicalTestArguments.java b/qadevOOo/runner/convwatch/GraphicalTestArguments.java
index 16062bd3629c..82083679afa3 100644
--- a/qadevOOo/runner/convwatch/GraphicalTestArguments.java
+++ b/qadevOOo/runner/convwatch/GraphicalTestArguments.java
@@ -310,7 +310,7 @@ public class GraphicalTestArguments
return true;
}
- static void showInternalFilterName(String _sFilterName, XMultiServiceFactory _xMSF)
+ private static void showInternalFilterName(String _sFilterName, XMultiServiceFactory _xMSF)
{
if (_sFilterName.length() == 0)
{
@@ -366,8 +366,8 @@ public class GraphicalTestArguments
}
public void setTargetFrameName(String _sTargetFrameName) {m_sTargetFrameName = _sTargetFrameName;}
public void setPrinterName(String _sName) {m_sPrinterName = _sName;}
- public void setHidden() { m_bHidden = true;}
- public void setViewable() {m_bHidden = false;}
+ private void setHidden() { m_bHidden = true;}
+ private void setViewable() {m_bHidden = false;}
public void setDefaultXMLFormatApp(String _sNameOfApp) {m_sDefaultXMLFormatApplication = _sNameOfApp;}
// get methods
@@ -434,7 +434,7 @@ public class GraphicalTestArguments
*/
public int getResolutionInDPI() {return m_nResolutionInDPI;}
- public static void checkIfMSWindowsConformPath(String _sPath)
+ private static void checkIfMSWindowsConformPath(String _sPath)
{
if (_sPath != null && _sPath.length() > 1)
{
diff --git a/qadevOOo/runner/convwatch/HTMLOutputter.java b/qadevOOo/runner/convwatch/HTMLOutputter.java
index 828d76bda74f..6425ec96816b 100644
--- a/qadevOOo/runner/convwatch/HTMLOutputter.java
+++ b/qadevOOo/runner/convwatch/HTMLOutputter.java
@@ -103,7 +103,7 @@ public class HTMLOutputter
}
}
- String getHREF(String _sHREF, String _sPathInfo)
+ private String getHREF(String _sHREF, String _sPathInfo)
{
StringBuffer a = new StringBuffer();
if (! OSHelper.isWindows())
@@ -128,7 +128,7 @@ public class HTMLOutputter
return a.toString();
}
- String tableDataCell(String _sValue)
+ private String tableDataCell(String _sValue)
{
StringBuffer a = new StringBuffer();
a.append("<TD>");
@@ -137,7 +137,7 @@ public class HTMLOutputter
return a.toString();
}
- String tableHeaderCell(String _sValue)
+ private String tableHeaderCell(String _sValue)
{
StringBuffer a = new StringBuffer();
a.append("<TH>");
@@ -187,7 +187,7 @@ public class HTMLOutputter
}
- String stronghtml(String _sValue)
+ private String stronghtml(String _sValue)
{
StringBuffer a = new StringBuffer();
a.append("<STRONG>");
diff --git a/qadevOOo/runner/convwatch/INIOutputter.java b/qadevOOo/runner/convwatch/INIOutputter.java
index 0851a9561302..dccef7351954 100644
--- a/qadevOOo/runner/convwatch/INIOutputter.java
+++ b/qadevOOo/runner/convwatch/INIOutputter.java
@@ -158,7 +158,7 @@ public class INIOutputter
}
}
- void writeResult(boolean _bCurrentResult) throws java.io.IOException
+ private void writeResult(boolean _bCurrentResult) throws java.io.IOException
{
// is the check positiv, in a defined range
if (_bCurrentResult)
diff --git a/qadevOOo/runner/convwatch/IniFile.java b/qadevOOo/runner/convwatch/IniFile.java
index 404751328f01..1b3f46942dc5 100644
--- a/qadevOOo/runner/convwatch/IniFile.java
+++ b/qadevOOo/runner/convwatch/IniFile.java
@@ -47,7 +47,7 @@ class IniFile
m_aList = loadLines();
}
- ArrayList<String> loadLines()
+ private ArrayList<String> loadLines()
{
File aFile = new File(m_sFilename);
ArrayList<String> aLines = new ArrayList<String>();
@@ -102,7 +102,7 @@ class IniFile
- boolean isRemark(String _sLine)
+ private boolean isRemark(String _sLine)
{
if ( ((_sLine.length() < 2) ) ||
( _sLine.startsWith("#")) ||
@@ -113,23 +113,23 @@ class IniFile
return false;
}
- String getItem(int i)
+ private String getItem(int i)
{
return m_aList.get(i);
}
- String buildSectionName(String _sSectionName)
+ private String buildSectionName(String _sSectionName)
{
String sFindSection = "[" + _sSectionName + "]";
return sFindSection;
}
- String toLowerIfNeed(String _sName)
+ private String toLowerIfNeed(String _sName)
{
return _sName.toLowerCase();
}
// return the number where this section starts
- int findSection(String _sSection)
+ private int findSection(String _sSection)
{
String sFindSection = toLowerIfNeed(buildSectionName(_sSection));
// ----------- find _sSection ---------------
@@ -155,7 +155,7 @@ class IniFile
}
// return the line number, where the key is found.
- int findKey(String _sSection, String _sKey)
+ private int findKey(String _sSection, String _sKey)
{
int i = findSection(_sSection);
if (i == -1)
@@ -167,7 +167,7 @@ class IniFile
}
// i must be the index in the list, where the well known section starts
- int findKeyFromKnownSection(int _nSectionIndex, String _sKey)
+ private int findKeyFromKnownSection(int _nSectionIndex, String _sKey)
{
_sKey = toLowerIfNeed(_sKey);
for (int j=_nSectionIndex + 1; j<m_aList.size();j++)
@@ -199,7 +199,7 @@ class IniFile
}
// i must be the index in the list, where the well known section starts
- int findLastKnownKeyIndex(int _nSectionIndex, String _sKey)
+ private int findLastKnownKeyIndex(int _nSectionIndex, String _sKey)
{
_sKey = toLowerIfNeed(_sKey);
int i = _nSectionIndex + 1;
@@ -231,7 +231,7 @@ class IniFile
return i;
}
- String getValue(int _nIndex)
+ private String getValue(int _nIndex)
{
String sLine = getItem(_nIndex).trim();
if (isRemark(sLine))
diff --git a/qadevOOo/runner/convwatch/MSOfficePrint.java b/qadevOOo/runner/convwatch/MSOfficePrint.java
index 4df3a2f23b10..90c0b93a3c52 100644
--- a/qadevOOo/runner/convwatch/MSOfficePrint.java
+++ b/qadevOOo/runner/convwatch/MSOfficePrint.java
@@ -47,7 +47,7 @@ public class MSOfficePrint
public void setPrinterName(String _s) {m_sPrinterName = _s;}
- static boolean isWordDocument(String _sSuffix)
+ private static boolean isWordDocument(String _sSuffix)
{
if (_sSuffix.toLowerCase().endsWith(".doc") ||
_sSuffix.toLowerCase().endsWith(".rtf") ||
@@ -58,7 +58,7 @@ public class MSOfficePrint
return false;
}
- static boolean isExcelDocument(String _sSuffix)
+ private static boolean isExcelDocument(String _sSuffix)
{
// xlt templates
// xlw
@@ -75,7 +75,7 @@ public class MSOfficePrint
return false;
}
- static boolean isPowerPointDocument(String _sSuffix)
+ private static boolean isPowerPointDocument(String _sSuffix)
{
if (_sSuffix.toLowerCase().endsWith(".pps") ||
_sSuffix.toLowerCase().endsWith(".ppt"))
@@ -223,7 +223,7 @@ public class MSOfficePrint
TimeHelper.waitInSeconds(2, "Give Microsoft Office some time to print.");
}
- public void realStartCommand(ArrayList<String> _aStartCommand) throws ConvWatchCancelException
+ private void realStartCommand(ArrayList<String> _aStartCommand) throws ConvWatchCancelException
{
if (_aStartCommand.isEmpty())
{
@@ -269,7 +269,7 @@ public class MSOfficePrint
}
- ArrayList<String> createWordPrintHelper() throws java.io.IOException
+ private ArrayList<String> createWordPrintHelper() throws java.io.IOException
{
// create a program in tmp file
String sTmpPath = util.utils.getUsersTempDir();
@@ -374,7 +374,7 @@ public class MSOfficePrint
// TODO: Maybe give a possibility to say where search the script from outside
- ArrayList<String> searchLocalFile(String _sScriptName)
+ private ArrayList<String> searchLocalFile(String _sScriptName)
{
String userdir = System.getProperty("user.dir");
String fs = System.getProperty("file.separator");
@@ -401,7 +401,7 @@ public class MSOfficePrint
return aList;
}
- ArrayList<String> createWordStoreHelper() throws java.io.IOException
+ private ArrayList<String> createWordStoreHelper() throws java.io.IOException
{
// create a program in tmp file
String sTmpPath = util.utils.getUsersTempDir();
@@ -483,7 +483,7 @@ public class MSOfficePrint
}
- ArrayList<String> createExcelPrintHelper() throws java.io.IOException
+ private ArrayList<String> createExcelPrintHelper() throws java.io.IOException
{
// create a program in tmp file
String sTmpPath = util.utils.getUsersTempDir();
@@ -578,7 +578,7 @@ public class MSOfficePrint
return aList;
}
- ArrayList<String> createExcelStoreHelper() throws java.io.IOException
+ private ArrayList<String> createExcelStoreHelper() throws java.io.IOException
{
// create a program in tmp file
String sTmpPath = util.utils.getUsersTempDir();
@@ -668,7 +668,7 @@ public class MSOfficePrint
return aList;
}
- ArrayList<String> createPowerPointPrintHelper() throws java.io.IOException
+ private ArrayList<String> createPowerPointPrintHelper() throws java.io.IOException
{
// create a program in tmp file
String sTmpPath = util.utils.getUsersTempDir();
@@ -771,7 +771,7 @@ public class MSOfficePrint
@param _sFilename a name to a ms office xml file
@return 'word' or 'excel' or '' if type not known
*/
- public String getOfficeType(String _sFilename)
+ private String getOfficeType(String _sFilename)
{
File aFile = new File(_sFilename);
if (! aFile.exists())
diff --git a/qadevOOo/runner/convwatch/OfficePrint.java b/qadevOOo/runner/convwatch/OfficePrint.java
index 9efa7049068a..376d0a6edbe7 100644
--- a/qadevOOo/runner/convwatch/OfficePrint.java
+++ b/qadevOOo/runner/convwatch/OfficePrint.java
@@ -68,7 +68,7 @@ public class OfficePrint {
/**
* shows the FilterName and MediaType from the given XComponent
*/
- static String getDocumentType( XComponent _aDoc )
+ private static String getDocumentType( XComponent _aDoc )
{
XModel xModel = UnoRuntime.queryInterface( XModel.class, _aDoc);
PropertyValue[] aArgs = xModel.getArgs();
@@ -85,7 +85,7 @@ public class OfficePrint {
return "";
}
- static void showDocumentType( XComponent _aDoc )
+ private static void showDocumentType( XComponent _aDoc )
{
String sNameValue = getDocumentType(_aDoc);
GlobalLogWriter.get().println(" Property: '" + sNameValue);
@@ -96,7 +96,7 @@ public class OfficePrint {
* or we crash here.
* Be aware, the ownership of the document gets to you, you have to close it.
*/
- public static XComponent loadFromURL(GraphicalTestArguments _aGTA,
+ private static XComponent loadFromURL(GraphicalTestArguments _aGTA,
String _sInputURL)
{
XComponent aDoc = null;
@@ -176,7 +176,7 @@ public class OfficePrint {
return aDoc;
}
- static boolean exportToPDF(XComponent _xComponent, String _sDestinationName)
+ private static boolean exportToPDF(XComponent _xComponent, String _sDestinationName)
{
XServiceInfo xServiceInfo =
UnoRuntime.queryInterface(
@@ -209,7 +209,7 @@ public class OfficePrint {
return bWorked;
}
- static String getFilterName_forPDF(XServiceInfo xServiceInfo)
+ private static String getFilterName_forPDF(XServiceInfo xServiceInfo)
{
String filterName = "";
@@ -254,7 +254,7 @@ public class OfficePrint {
- public static boolean storeAsPDF(GraphicalTestArguments _aGTA,
+ private static boolean storeAsPDF(GraphicalTestArguments _aGTA,
String _sInputURL,
String _sOutputURL)
{
@@ -274,7 +274,7 @@ public class OfficePrint {
return bBack;
}
- public static boolean storeAsPDF(GraphicalTestArguments _aGTA,
+ private static boolean storeAsPDF(GraphicalTestArguments _aGTA,
XComponent _aDoc,
String _sOutputURL)
{
@@ -304,7 +304,7 @@ public class OfficePrint {
* check existence of _sPrintFileURL
*/
- public static boolean printToFileWithOOo(GraphicalTestArguments _aGTA,
+ private static boolean printToFileWithOOo(GraphicalTestArguments _aGTA,
String _sInputURL,
String _sOutputURL,
String _sPrintFileURL)
@@ -335,7 +335,7 @@ public class OfficePrint {
}
- public static void createInfoFile(String _sFile, GraphicalTestArguments _aGTA)
+ private static void createInfoFile(String _sFile, GraphicalTestArguments _aGTA)
{
createInfoFile(_sFile, _aGTA, "");
}
@@ -819,7 +819,7 @@ public class OfficePrint {
- public static String getInternalFilterName(String _sFilterName, XMultiServiceFactory _xMSF)
+ private static String getInternalFilterName(String _sFilterName, XMultiServiceFactory _xMSF)
{
if (_sFilterName.length() == 0)
{
@@ -892,7 +892,7 @@ public class OfficePrint {
- static String getServiceNameFromFilterName(String _sFilterName, XMultiServiceFactory _xMSF)
+ private static String getServiceNameFromFilterName(String _sFilterName, XMultiServiceFactory _xMSF)
{
if (_sFilterName.length() == 0)
{
@@ -965,7 +965,7 @@ public class OfficePrint {
}
- public static String getFileExtension(String _sInternalFilterName, XMultiServiceFactory _xMSF)
+ private static String getFileExtension(String _sInternalFilterName, XMultiServiceFactory _xMSF)
{
if (_sInternalFilterName.length() == 0)
{
diff --git a/qadevOOo/runner/convwatch/PRNCompare.java b/qadevOOo/runner/convwatch/PRNCompare.java
index ff676ea18fb3..4b3974840bfc 100644
--- a/qadevOOo/runner/convwatch/PRNCompare.java
+++ b/qadevOOo/runner/convwatch/PRNCompare.java
@@ -51,7 +51,7 @@ public class PRNCompare
}
- int getMaxNumOfFileEntry(String _sDirectory, String _sBasename)
+ private int getMaxNumOfFileEntry(String _sDirectory, String _sBasename)
{
// TODO: check if directory exist should be done earlier
File aDirectory = new File(_sDirectory);
@@ -117,10 +117,10 @@ public class PRNCompare
public void setBorderMove(TriState _b) {m_tUseBorderMove = _b;}
public TriState getBorderMove() {return m_tUseBorderMove;}
public void setMaxPages(int _n) {m_nMaxPages = _n;}
- int getMaxPages() {return m_nMaxPages;}
+ private int getMaxPages() {return m_nMaxPages;}
public void setResolutionInDPI(int _n) {m_nResolutionInDPI = _n;}
- int getResolutionInDPI() {return m_nResolutionInDPI;}
+ private int getResolutionInDPI() {return m_nResolutionInDPI;}
public void setDocumentType(String _sTypeName)
{
@@ -157,7 +157,7 @@ public class PRNCompare
return aList;
}
- static String getJPEGName(String _sOutputPath, String _sBasename, String _sGS_PageOutput)
+ private static String getJPEGName(String _sOutputPath, String _sBasename, String _sGS_PageOutput)
{
String fs = System.getProperty("file.separator");
@@ -233,7 +233,7 @@ public class PRNCompare
* m_sReferenceFile
* m_sOutputPath
*/
- public StatusHelper[] createDiffs(String _sOutputPath, String _sSourcePath1, String _sSourceFile1, String _sSourcePath2, String _sSourceFile2, int _nMaxDiffs, TriState _tUseBorderMove)
+ private StatusHelper[] createDiffs(String _sOutputPath, String _sSourcePath1, String _sSourceFile1, String _sSourcePath2, String _sSourceFile2, int _nMaxDiffs, TriState _tUseBorderMove)
{
if (_nMaxDiffs < 1)
{
@@ -342,7 +342,7 @@ public class PRNCompare
}
- public StatusHelper[] createDiffs(String[] _aRefList, String[] _aPSList, int _nMaxDiffs, TriState _tUseBorderMove)
+ private StatusHelper[] createDiffs(String[] _aRefList, String[] _aPSList, int _nMaxDiffs, TriState _tUseBorderMove)
{
if (_nMaxDiffs < 1)
{
@@ -466,7 +466,7 @@ public class PRNCompare
return compareJPEGs(_sOldGfx, _sNewGfx, sDiffName);
}
- public static String compareJPEGs(String _sOldGfx, String _sNewGfx, String _sDiffGfx)
+ private static String compareJPEGs(String _sOldGfx, String _sNewGfx, String _sDiffGfx)
{
String sComposite = "composite";
if (OSHelper.isWindows())
@@ -502,7 +502,7 @@ public class PRNCompare
* function checks how many different colors a picture contains.
* if it's only one color (nResult==1), like background color, there is no difference.
*/
- int identify(String _sDiffGfx)
+ private int identify(String _sDiffGfx)
{
int nResult = 0;
// would like to know what the meaning of %k is for ImageMagick's 'identify'
@@ -614,7 +614,7 @@ public class PRNCompare
* so the pixel count between old graphics and new graphics is twice the more.
*
*/
- public int estimateGfx(String _sOldGfx, String _sNewGfx, String _sDiffGfx)
+ private int estimateGfx(String _sOldGfx, String _sNewGfx, String _sDiffGfx)
throws java.io.IOException
{
// new count pixels
diff --git a/qadevOOo/runner/convwatch/PerformanceContainer.java b/qadevOOo/runner/convwatch/PerformanceContainer.java
index 87612dc00531..31996739da9e 100644
--- a/qadevOOo/runner/convwatch/PerformanceContainer.java
+++ b/qadevOOo/runner/convwatch/PerformanceContainer.java
@@ -116,7 +116,7 @@ public class PerformanceContainer /* extends *//* implements */ {
out.write("storeaspdftime=" + String.valueOf(m_nTime[ StoreAsPDF ]) + ls);
}
- public static double stringToDouble(String _sStr)
+ private static double stringToDouble(String _sStr)
{
double nValue = 0;
try
@@ -130,7 +130,7 @@ public class PerformanceContainer /* extends *//* implements */ {
return nValue;
}
- public static long secondsToMilliSeconds(double _nSeconds)
+ private static long secondsToMilliSeconds(double _nSeconds)
{
return (long)(_nSeconds * 1000.0);
}
diff --git a/qadevOOo/runner/convwatch/PixelCounter.java b/qadevOOo/runner/convwatch/PixelCounter.java
index 6e41bca6232e..29c244d57465 100644
--- a/qadevOOo/runner/convwatch/PixelCounter.java
+++ b/qadevOOo/runner/convwatch/PixelCounter.java
@@ -93,7 +93,7 @@ class graphics_stuff
return 0;
}
- public static void countPixel(ImageHelper img, int _w, int _h, CountPixel _aPixelCounter)
+ private 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++) {
@@ -128,7 +128,7 @@ public class PixelCounter {
private ImageHelper m_aImage;
- public int countNotWhitePixel(String _sFile)
+ private int countNotWhitePixel(String _sFile)
throws java.io.IOException
{
m_aImage = ImageHelper.createImageHelper(_sFile);
@@ -136,7 +136,7 @@ public class PixelCounter {
return nw;
}
- public int countNotBlackPixel(String _sFile)
+ private int countNotBlackPixel(String _sFile)
throws java.io.IOException
{
m_aImage = ImageHelper.createImageHelper(_sFile);
diff --git a/qadevOOo/runner/convwatch/ReferenceBuilder.java b/qadevOOo/runner/convwatch/ReferenceBuilder.java
index c9fbc9a8dda6..8b8e31d063e6 100644
--- a/qadevOOo/runner/convwatch/ReferenceBuilder.java
+++ b/qadevOOo/runner/convwatch/ReferenceBuilder.java
@@ -79,7 +79,7 @@ public class ReferenceBuilder extends EnhancedComplexTestCase
// The test method itself.
private String m_sInputPath = "";
private String m_sReferencePath = "";
- void initMember()
+ private void initMember()
{
// MUST PARAMETER
// INPUT_PATH ----------
@@ -192,7 +192,7 @@ public class ReferenceBuilder extends EnhancedComplexTestCase
}
}
- void runGDC(String _sInputPath, String _sReferencePath)
+ private void runGDC(String _sInputPath, String _sReferencePath)
{
// first do a check if the reference not already exist, this is a big speedup, due to the fact,
// we don't need to start a new office.
diff --git a/qadevOOo/runner/convwatch/TriState.java b/qadevOOo/runner/convwatch/TriState.java
index 5c27afa4153f..c72e06c2b913 100644
--- a/qadevOOo/runner/convwatch/TriState.java
+++ b/qadevOOo/runner/convwatch/TriState.java
@@ -41,7 +41,7 @@ public class TriState
Returns the value of this TriState object as an int
* @return the primitive <code>int</code> value of this object.
*/
- public int intValue()
+ private int intValue()
{
return m_nValue;
}
diff --git a/qadevOOo/runner/graphical/DateHelper.java b/qadevOOo/runner/graphical/DateHelper.java
index 1e12d16834a8..1d1ecd9c37f4 100644
--- a/qadevOOo/runner/graphical/DateHelper.java
+++ b/qadevOOo/runner/graphical/DateHelper.java
@@ -35,7 +35,7 @@ public class DateHelper
return getDateString("[yyyy/MM/dd HH:mm:ss]");
}
- public static String getDateString(String _sFormat)
+ private static String getDateString(String _sFormat)
{
GregorianCalendar aCalendar = new GregorianCalendar();
StringBuffer aBuf = new StringBuffer();
diff --git a/qadevOOo/runner/graphical/DirectoryHelper.java b/qadevOOo/runner/graphical/DirectoryHelper.java
index ca36ef8b0839..a52add895a0b 100644
--- a/qadevOOo/runner/graphical/DirectoryHelper.java
+++ b/qadevOOo/runner/graphical/DirectoryHelper.java
@@ -30,7 +30,7 @@ public class DirectoryHelper
private ArrayList<String> m_aFileList = new ArrayList<String>();
private boolean m_bRecursiveIsAllowed = true;
- void setRecursiveIsAllowed(boolean _bValue)
+ private void setRecursiveIsAllowed(boolean _bValue)
{
m_bRecursiveIsAllowed = _bValue;
}
@@ -80,7 +80,7 @@ public class DirectoryHelper
return a.m_aFileList.toArray();
}
- void traverse_impl( String afileDirectory, FileFilter _aFileFilter )
+ private void traverse_impl( String afileDirectory, FileFilter _aFileFilter )
{
File fileDirectory = new File(afileDirectory);
// Testing, if the file is a directory, and if so, it throws an exception
diff --git a/qadevOOo/runner/graphical/FileHelper.java b/qadevOOo/runner/graphical/FileHelper.java
index aa565f98efa5..bee04eb64622 100644
--- a/qadevOOo/runner/graphical/FileHelper.java
+++ b/qadevOOo/runner/graphical/FileHelper.java
@@ -163,7 +163,7 @@ public class FileHelper
makeDirectories(first, path, "0777");
}
- public static void makeDirectories(String first, String path, String _sMode)
+ private static void makeDirectories(String first, String path, String _sMode)
{
String fs = System.getProperty("file.separator");
if (path.startsWith(fs + fs)) // starts with UNC Path
@@ -200,7 +200,7 @@ public class FileHelper
// return;
}
- public static void chmod(File file, String mode) throws java.io.IOException
+ private static void chmod(File file, String mode) throws java.io.IOException
{
Runtime.getRuntime().exec
(new String[]
@@ -597,7 +597,7 @@ public class FileHelper
}
- public static void addBasenameToFile(String _sIndexFilename, String _sBasename, String _sCreator, String _sType, String _sSource)
+ private static void addBasenameToFile(String _sIndexFilename, String _sBasename, String _sCreator, String _sType, String _sSource)
{
String sPath;
if (_sIndexFilename.startsWith("file:"))
diff --git a/qadevOOo/runner/graphical/IniFile.java b/qadevOOo/runner/graphical/IniFile.java
index 30b38c3b15e8..b2508b173c38 100644
--- a/qadevOOo/runner/graphical/IniFile.java
+++ b/qadevOOo/runner/graphical/IniFile.java
@@ -357,7 +357,7 @@ public class IniFile implements Enumeration<String>
*/
// TODO: make private
- public void store()
+ private void store()
{
if (m_bListContainUnsavedChanges == false)
{
diff --git a/qadevOOo/runner/graphical/JPEGCreator.java b/qadevOOo/runner/graphical/JPEGCreator.java
index dccc588da516..6d9c5c698d37 100644
--- a/qadevOOo/runner/graphical/JPEGCreator.java
+++ b/qadevOOo/runner/graphical/JPEGCreator.java
@@ -91,7 +91,7 @@ public class JPEGCreator extends EnhancedComplexTestCase
* Create a lot of smaller and nicer Pictures of the big fat pages.
* Looks better
*/
- public void createSmallPictures(String _sJPEGSchema)
+ private void createSmallPictures(String _sJPEGSchema)
{
ParameterHelper aParam = new ParameterHelper(param);
if (! aParam.createSmallPictures())
@@ -193,7 +193,7 @@ private static void convertToWidth340(String _sFrom, String _To)
* @param _aParam
* @return the schema of the first jpeg name
*/
- String createJPEG(String _sFile, String _sAdditional, ParameterHelper _aParam)
+ private String createJPEG(String _sFile, String _sAdditional, ParameterHelper _aParam)
{
if (_sFile.startsWith("file:///"))
{
@@ -342,7 +342,7 @@ private static void convertToWidth340(String _sFrom, String _To)
* with leading '0' (zero)
* @return number of really existing pages of a given JPEG schema
*/
- public int countPages(String _sJPEGSchema)
+ private int countPages(String _sJPEGSchema)
{
int nPages = 0;
if (_sJPEGSchema.length() > 0)
diff --git a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java
index 52a62c659da6..2132297f893d 100644
--- a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java
+++ b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java
@@ -218,7 +218,7 @@ public class MSOfficePostscriptCreator implements IOffice
/**
* print the given file (_sInputFile) to the file name (_sPrintFile)
*/
- public void printToFileWithMSOffice( ParameterHelper _aGTA,
+ private void printToFileWithMSOffice( ParameterHelper _aGTA,
String _sInputFile,
String _sPrintFilename) throws OfficeException, java.io.IOException
{
@@ -285,7 +285,7 @@ public class MSOfficePostscriptCreator implements IOffice
TimeHelper.waitInSeconds(2, "Give Microsoft Office some time to print.");
}
- public void realStartCommand(ArrayList<String> _aStartCommand) throws OfficeException
+ private void realStartCommand(ArrayList<String> _aStartCommand) throws OfficeException
{
if (_aStartCommand.isEmpty())
{
@@ -335,7 +335,7 @@ public class MSOfficePostscriptCreator implements IOffice
return sPerlExe;
}
- ArrayList<String> createWordPrintHelper() throws java.io.IOException
+ private ArrayList<String> createWordPrintHelper() throws java.io.IOException
{
// create a program in tmp file
String sTmpPath = util.utils.getUsersTempDir();
@@ -439,7 +439,7 @@ public class MSOfficePostscriptCreator implements IOffice
// TODO: Maybe give a possibility to say where search the script from outside
- ArrayList<String> searchLocalFile(String _sScriptName)
+ private ArrayList<String> searchLocalFile(String _sScriptName)
{
String userdir = System.getProperty("user.dir");
@@ -466,7 +466,7 @@ public class MSOfficePostscriptCreator implements IOffice
return aList;
}
- ArrayList<String> createWordStoreHelper() throws java.io.IOException
+ private ArrayList<String> createWordStoreHelper() throws java.io.IOException
{
// create a program in tmp file
String sTmpPath = util.utils.getUsersTempDir();
@@ -548,7 +548,7 @@ public class MSOfficePostscriptCreator implements IOffice
}
- ArrayList<String> createExcelPrintHelper() throws java.io.IOException
+ private ArrayList<String> createExcelPrintHelper() throws java.io.IOException
{
// create a program in tmp file
String sTmpPath = util.utils.getUsersTempDir();
@@ -651,7 +651,7 @@ public class MSOfficePostscriptCreator implements IOffice
return aList;
}
- ArrayList<String> createExcelStoreHelper() throws java.io.IOException
+ private ArrayList<String> createExcelStoreHelper() throws java.io.IOException
{
// create a program in tmp file
String sTmpPath = util.utils.getUsersTempDir();
@@ -740,7 +740,7 @@ public class MSOfficePostscriptCreator implements IOffice
return aList;
}
- ArrayList<String> createPowerPointPrintHelper() throws java.io.IOException
+ private ArrayList<String> createPowerPointPrintHelper() throws java.io.IOException
{
// create a program in tmp file
String sTmpPath = util.utils.getUsersTempDir();
@@ -845,7 +845,7 @@ public class MSOfficePostscriptCreator implements IOffice
@param _sFilename a name to a ms office xml file
@return 'word' or 'excel' or '' if type not known
*/
- public String getOfficeType(String _sFilename)
+ private String getOfficeType(String _sFilename)
{
File aFile = new File(_sFilename);
if (! aFile.exists())
diff --git a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
index f6d1d3fcf922..4408b527a1f6 100644
--- a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
+++ b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
@@ -345,7 +345,7 @@ public class OpenOfficePostscriptCreator implements IOffice
- public boolean storeAsPDF(ParameterHelper _aGTA,
+ private boolean storeAsPDF(ParameterHelper _aGTA,
XComponent _aDoc,
String _sOutputURL) throws OfficeException
{
@@ -647,7 +647,7 @@ public class OpenOfficePostscriptCreator implements IOffice
- public String getInternalFilterName(String _sFilterName, XMultiServiceFactory _xMSF)
+ private String getInternalFilterName(String _sFilterName, XMultiServiceFactory _xMSF)
{
if (_sFilterName.length() == 0)
{
@@ -720,7 +720,7 @@ public class OpenOfficePostscriptCreator implements IOffice
- String getServiceNameFromFilterName(String _sFilterName, XMultiServiceFactory _xMSF)
+ private String getServiceNameFromFilterName(String _sFilterName, XMultiServiceFactory _xMSF)
{
if (_sFilterName.length() == 0)
{
@@ -792,7 +792,7 @@ public class OpenOfficePostscriptCreator implements IOffice
}
- public static String getFileExtension(String _sInternalFilterName, XMultiServiceFactory _xMSF)
+ private static String getFileExtension(String _sInternalFilterName, XMultiServiceFactory _xMSF)
{
if (_sInternalFilterName.length() == 0)
{
diff --git a/qadevOOo/runner/graphical/PerformanceContainer.java b/qadevOOo/runner/graphical/PerformanceContainer.java
index 32eaac791cf0..9291d01b5c00 100644
--- a/qadevOOo/runner/graphical/PerformanceContainer.java
+++ b/qadevOOo/runner/graphical/PerformanceContainer.java
@@ -130,7 +130,7 @@ public class PerformanceContainer /* extends *//* implements */ {
_aIniFile.insertValue(_sSection, "alltime" , String.valueOf(m_nTime[ AllTime ]));
}
- public static double stringToDouble(String _sStr)
+ private static double stringToDouble(String _sStr)
{
double nValue = 0;
try
@@ -144,7 +144,7 @@ public class PerformanceContainer /* extends *//* implements */ {
return nValue;
}
- public static long secondsToMilliSeconds(double _nSeconds)
+ private static long secondsToMilliSeconds(double _nSeconds)
{
return (long)(_nSeconds * 1000.0);
}
diff --git a/qadevOOo/runner/graphical/PixelCounter.java b/qadevOOo/runner/graphical/PixelCounter.java
index 887424772d65..0807b26cbdeb 100644
--- a/qadevOOo/runner/graphical/PixelCounter.java
+++ b/qadevOOo/runner/graphical/PixelCounter.java
@@ -120,7 +120,7 @@ class CountNotBlack extends CountPixel
class graphics_stuff
{
- public static void countPixel(ImageHelper img, int _w, int _h, CountPixel _aPixelCounter)
+ private 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++) {
@@ -153,7 +153,7 @@ class graphics_stuff
public class PixelCounter {
- public int countNotWhitePixel(String _sFile)
+ private int countNotWhitePixel(String _sFile)
throws java.io.IOException
{
ImageHelper aImage = ImageHelper.createImageHelper(_sFile);
@@ -161,7 +161,7 @@ public class PixelCounter {
return nw;
}
- public int countNotBlackPixel(String _sFile)
+ private int countNotBlackPixel(String _sFile)
throws java.io.IOException
{
ImageHelper aImage = ImageHelper.createImageHelper(_sFile);
diff --git a/qadevOOo/runner/helper/APIDescGetter.java b/qadevOOo/runner/helper/APIDescGetter.java
index 86a501b05cfc..6c94706dc5c4 100644
--- a/qadevOOo/runner/helper/APIDescGetter.java
+++ b/qadevOOo/runner/helper/APIDescGetter.java
@@ -260,7 +260,7 @@ public class APIDescGetter extends DescGetter
return entry;
}
- protected static DescEntry[] getSubEntries(BufferedReader cvsFile,
+ private static DescEntry[] getSubEntries(BufferedReader cvsFile,
DescEntry parent)
{
String line = "";
@@ -463,7 +463,7 @@ public class APIDescGetter extends DescGetter
/**
* This method ensures that XComponent will be the last in the list of interfaces
*/
- protected static Object[] makeArray(ArrayList<DescEntry> entries)
+ private static Object[] makeArray(ArrayList<DescEntry> entries)
{
Object[] entriesArray = entries.toArray();
ArrayList<Object> returnArray = new ArrayList<Object>();
@@ -491,7 +491,7 @@ public class APIDescGetter extends DescGetter
return returnArray.toArray();
}
- protected static DescEntry setErrorDescription(DescEntry entry,
+ private static DescEntry setErrorDescription(DescEntry entry,
String ErrorMsg)
{
if (entry == null)
@@ -505,7 +505,7 @@ public class APIDescGetter extends DescGetter
return entry;
}
- protected static DescEntry[] getDescArray(Object[] list)
+ private static DescEntry[] getDescArray(Object[] list)
{
DescEntry[] entries = new DescEntry[list.length];
@@ -517,7 +517,7 @@ public class APIDescGetter extends DescGetter
return entries;
}
- protected DescEntry getFromClassPath(String aEntry)
+ private DescEntry getFromClassPath(String aEntry)
{
int dotindex = aEntry.indexOf('.');
@@ -631,7 +631,7 @@ public class APIDescGetter extends DescGetter
return theEntry;
}
- protected static DescEntry getFromDirectory(String descPath, String entry,
+ private static DescEntry getFromDirectory(String descPath, String entry,
boolean debug)
{
int dotindex = entry.indexOf('.');
@@ -737,7 +737,7 @@ public class APIDescGetter extends DescGetter
return namesList;
}
- protected ArrayList<String> getSubObjects(String job)
+ private ArrayList<String> getSubObjects(String job)
{
ArrayList<String> namesList = new ArrayList<String>();
StringTokenizer st = new StringTokenizer(job, ",");
@@ -778,7 +778,7 @@ public class APIDescGetter extends DescGetter
return scenario;
}
- protected String[] getScenarioFromDirectory(String descPath, String job)
+ private String[] getScenarioFromDirectory(String descPath, String job)
{
String[] modules = null;
ArrayList<String> componentList = new ArrayList<String>();
@@ -832,7 +832,7 @@ public class APIDescGetter extends DescGetter
}
- protected String[] getScenarioFromClassPath(String job)
+ private String[] getScenarioFromClassPath(String job)
{
String subdir = "/";
@@ -903,7 +903,7 @@ public class APIDescGetter extends DescGetter
return scenario;
}
- protected String getComponentForString(String full, String module)
+ private String getComponentForString(String full, String module)
{
String component = "";
@@ -927,7 +927,7 @@ public class APIDescGetter extends DescGetter
return component;
}
- protected boolean isUnusedModule(String moduleName)
+ private boolean isUnusedModule(String moduleName)
{
ArrayList<String> removed = new ArrayList<String>();
removed.add("acceptor");
diff --git a/qadevOOo/runner/helper/CfgParser.java b/qadevOOo/runner/helper/CfgParser.java
index bda0cf09d9b3..3ab2b6a28b52 100644
--- a/qadevOOo/runner/helper/CfgParser.java
+++ b/qadevOOo/runner/helper/CfgParser.java
@@ -120,7 +120,7 @@ public class CfgParser
}
}
- protected Properties getProperties(String name)
+ private Properties getProperties(String name)
{
// get the resource file
Properties prop = new Properties();
@@ -158,7 +158,7 @@ public class CfgParser
return prop;
}
- protected String getDefaultFileName(boolean home)
+ private String getDefaultFileName(boolean home)
{
String fileSeparator = System.getProperty("file.separator");
String path = "";
diff --git a/qadevOOo/runner/helper/ClParser.java b/qadevOOo/runner/helper/ClParser.java
index fbe102ebffa8..8e4c0ab47bf0 100644
--- a/qadevOOo/runner/helper/ClParser.java
+++ b/qadevOOo/runner/helper/ClParser.java
@@ -148,7 +148,7 @@ public class ClParser
/*
* This method maps commandline Parameters to TestParameters
*/
- protected Properties getMapping()
+ private Properties getMapping()
{
Properties map = new Properties();
map.setProperty("-cs", "ConnectionString");
@@ -169,7 +169,7 @@ public class ClParser
return map;
}
- protected String getParameterFor(Properties map, String name)
+ private String getParameterFor(Properties map, String name)
{
String ret = map.getProperty(name);
diff --git a/qadevOOo/runner/helper/ConfigHelper.java b/qadevOOo/runner/helper/ConfigHelper.java
index d2af126d0eab..3d62291baa00 100644
--- a/qadevOOo/runner/helper/ConfigHelper.java
+++ b/qadevOOo/runner/helper/ConfigHelper.java
@@ -125,7 +125,7 @@ public class ConfigHelper
}
- public Object readRelativeKey(String sRelPath,
+ private Object readRelativeKey(String sRelPath,
String sKey )
throws com.sun.star.container.NoSuchElementException
{
@@ -143,7 +143,7 @@ public class ConfigHelper
}
- public void writeRelativeKey(String sRelPath,
+ private void writeRelativeKey(String sRelPath,
String sKey ,
Object aValue )
throws com.sun.star.container.NoSuchElementException
@@ -344,7 +344,7 @@ public class ConfigHelper
* @throws com.sun.star.uno.Exception on any error
* @return A XNameContainer of the Set
*/
- public XNameContainer getSet(String setName)
+ private XNameContainer getSet(String setName)
throws com.sun.star.uno.Exception
{
XNameReplace xCont = UnoRuntime.queryInterface(XNameReplace.class, m_xConfig);
diff --git a/qadevOOo/runner/helper/OfficeProvider.java b/qadevOOo/runner/helper/OfficeProvider.java
index c12d2519e852..2d1d01497046 100644
--- a/qadevOOo/runner/helper/OfficeProvider.java
+++ b/qadevOOo/runner/helper/OfficeProvider.java
@@ -54,7 +54,7 @@ public class OfficeProvider implements AppProvider
/**
* copy the user layer to a safe place, usually to $TMP/user_backup$USER
*/
- public void backupUserLayer(TestParameters param, XMultiServiceFactory msf)
+ private void backupUserLayer(TestParameters param, XMultiServiceFactory msf)
{
try
{
@@ -316,7 +316,7 @@ public class OfficeProvider implements AppProvider
* @throws com.sun.star.connection.NoConnectException
* @throws Exception
*/
- protected static XMultiServiceFactory connect(String connectStr)
+ private static XMultiServiceFactory connect(String connectStr)
throws com.sun.star.uno.Exception,
com.sun.star.uno.RuntimeException,
com.sun.star.connection.NoConnectException,
@@ -579,7 +579,7 @@ public class OfficeProvider implements AppProvider
return result;
}
- protected boolean closeAllWindows(XDesktop desk)
+ private boolean closeAllWindows(XDesktop desk)
{
final XEnumerationAccess compEnumAccess = desk.getComponents();
final XEnumeration compEnum = compEnumAccess.createEnumeration();
@@ -613,7 +613,7 @@ public class OfficeProvider implements AppProvider
return res;
}
- public static XStringSubstitution createStringSubstitution(XMultiServiceFactory xMSF)
+ private static XStringSubstitution createStringSubstitution(XMultiServiceFactory xMSF)
{
Object xPathSubst = null;
@@ -641,7 +641,7 @@ public class OfficeProvider implements AppProvider
* converts directory without 'file:///' prefix.
* and System dependent file separator
*/
- public static String getDirSys(String dir)
+ private static String getDirSys(String dir)
{
String sysDir = "";
diff --git a/qadevOOo/runner/helper/OfficeWatcher.java b/qadevOOo/runner/helper/OfficeWatcher.java
index e001ca335ab2..2e48887c5d9f 100644
--- a/qadevOOo/runner/helper/OfficeWatcher.java
+++ b/qadevOOo/runner/helper/OfficeWatcher.java
@@ -99,14 +99,14 @@ public class OfficeWatcher extends Thread implements share.Watcher {
dbg("finished");
}
- protected void shortWait(int timeOut) {
+ private void shortWait(int timeOut) {
try {
OfficeWatcher.sleep(timeOut);
} catch (java.lang.InterruptedException ie) {
}
}
- protected void dbg(String message) {
+ private void dbg(String message) {
if (debug) {
System.out.println(utils.getDateTime() + "OfficeWatcher: " + message);
}
diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java
index 042f0d6132ed..43372d224b67 100644
--- a/qadevOOo/runner/helper/ProcessHandler.java
+++ b/qadevOOo/runner/helper/ProcessHandler.java
@@ -480,7 +480,7 @@ public class ProcessHandler
/**
* Returns the time in seconds since 1st January 1970
*/
- public static long getSystemTime()
+ private static long getSystemTime()
{
final long nTime = System.currentTimeMillis();
return nTime;
@@ -512,7 +512,7 @@ public class ProcessHandler
}
}
- protected void execute()
+ private void execute()
{
if (isStarted())
{
@@ -607,7 +607,7 @@ public class ProcessHandler
* @return <code>true</code> if process correctly exited
* (exit code doesn't affect to this result).
*/
- public boolean waitFor(long timeout)
+ private boolean waitFor(long timeout)
{
return waitFor(timeout, true);
}
@@ -690,7 +690,7 @@ public class ProcessHandler
return isFinished();
}
- protected void flushInput()
+ private void flushInput()
{
if (stdIn == null)
{
@@ -797,7 +797,7 @@ public class ProcessHandler
/** Causes the thread to sleep some time.
*/
- public static void shortWait(long milliseconds)
+ private static void shortWait(long milliseconds)
{
try
{
@@ -849,7 +849,7 @@ public class ProcessHandler
*
* Reason: interrupt() seems not to work as expected.
*/
- public synchronized void holdOn()
+ private synchronized void holdOn()
{
m_bInterrupt = true;
interrupt();
diff --git a/qadevOOo/runner/helper/StringHelper.java b/qadevOOo/runner/helper/StringHelper.java
index 7d985cc03be1..3ed630030e76 100644
--- a/qadevOOo/runner/helper/StringHelper.java
+++ b/qadevOOo/runner/helper/StringHelper.java
@@ -21,12 +21,12 @@ package helper;
public class StringHelper
{
- public static String doubleQuote(String _sStr)
+ private static String doubleQuote(String _sStr)
{
return "\"" + _sStr + "\"";
}
- public static String singleQuote(String _sStr)
+ private static String singleQuote(String _sStr)
{
return "'" + _sStr + "'";
}
diff --git a/qadevOOo/runner/helper/URLHelper.java b/qadevOOo/runner/helper/URLHelper.java
index 9cd18fb9d3f5..c869f1a1d48b 100644
--- a/qadevOOo/runner/helper/URLHelper.java
+++ b/qadevOOo/runner/helper/URLHelper.java
@@ -123,7 +123,7 @@ public class URLHelper
* an url which represent the given system path
* and uses the given protocol
*/
- public static String getURLWithProtocolFromSystemPath( File aSystemPath, File aBasePath, String sServerURL )
+ private static String getURLWithProtocolFromSystemPath( File aSystemPath, File aBasePath, String sServerURL )
{
String sFileURL = URLHelper.getFileURLFromSystemPath(aSystemPath);
String sBaseURL = URLHelper.getFileURLFromSystemPath(aBasePath );
diff --git a/qadevOOo/runner/lib/Parameters.java b/qadevOOo/runner/lib/Parameters.java
index 900646fcb807..9ee716eeefd0 100644
--- a/qadevOOo/runner/lib/Parameters.java
+++ b/qadevOOo/runner/lib/Parameters.java
@@ -144,7 +144,7 @@ public class Parameters implements XPropertySet {
};
}
- public Map<String,Object> toMap() {
+ private Map<String,Object> toMap() {
return new HashMap<String,Object>(parameters) {
public String get(String obj) {
return Parameters.this.get(obj);
diff --git a/qadevOOo/runner/org/openoffice/Runner.java b/qadevOOo/runner/org/openoffice/Runner.java
index 6aecdf59d11d..5513c0bb17cf 100644
--- a/qadevOOo/runner/org/openoffice/Runner.java
+++ b/qadevOOo/runner/org/openoffice/Runner.java
@@ -39,7 +39,7 @@ public class Runner
private static long m_nStartTime;
- public static long getRunnerStartTime()
+ private static long getRunnerStartTime()
{
return m_nStartTime;
}
@@ -60,7 +60,7 @@ public class Runner
/*
return the time, which is done until last startTime()
*/
- public static long meanTime(long _nCurrentTimer)
+ private static long meanTime(long _nCurrentTimer)
{
if (_nCurrentTimer == 0)
{
diff --git a/qadevOOo/runner/stats/DataBaseOutProducer.java b/qadevOOo/runner/stats/DataBaseOutProducer.java
index b36dcfc07c98..6ffe9b705c39 100644
--- a/qadevOOo/runner/stats/DataBaseOutProducer.java
+++ b/qadevOOo/runner/stats/DataBaseOutProducer.java
@@ -87,7 +87,7 @@ public abstract class DataBaseOutProducer implements LogWriter {
* @param entry The description entry that is take as root
* @param log The log writer
*/
- protected boolean findTypeInEntryTree(DescEntry entry, LogWriter log) {
+ private boolean findTypeInEntryTree(DescEntry entry, LogWriter log) {
boolean returnVal = true;
if (isWriteableEntryType(entry)) {
returnVal &= insertEntry(entry, log);
@@ -108,7 +108,7 @@ public abstract class DataBaseOutProducer implements LogWriter {
* @param entry The entry to write.
* @param log The log writer.
*/
- protected boolean insertEntry(DescEntry entry, LogWriter log) {
+ private boolean insertEntry(DescEntry entry, LogWriter log) {
// copy the swlInput HashMap, so it can be reset easily for the next run
HashMap<String,Object> copySqlInput = new HashMap<String,Object>();
copySqlInput.putAll(mSqlInput);
@@ -138,7 +138,7 @@ public abstract class DataBaseOutProducer implements LogWriter {
* @param entry The entry that is checked
* @return True, if it is indeed a writeable entry.
*/
- protected boolean isWriteableEntryType(DescEntry entry) {
+ private boolean isWriteableEntryType(DescEntry entry) {
boolean result = false;
for (int i=0; i<mWriteableEntryTypes.length; i++) {
if (entry.EntryType.equals(mWriteableEntryTypes[i])) {
diff --git a/qadevOOo/runner/stats/OutProducerFactory.java b/qadevOOo/runner/stats/OutProducerFactory.java
index c900cf484e40..a657a116f3d5 100644
--- a/qadevOOo/runner/stats/OutProducerFactory.java
+++ b/qadevOOo/runner/stats/OutProducerFactory.java
@@ -65,7 +65,7 @@ public class OutProducerFactory {
* @param param The test parameters
* @return The database out producer, or null if it couldn't be created.
*/
- public static LogWriter createDataBaseOutProducer(HashMap<String,Object> param) {
+ private static LogWriter createDataBaseOutProducer(HashMap<String,Object> param) {
String dataProducerName = (String)param.get("DataBaseOutProducer");
if (dataProducerName == null) {
String testBaseName = (String)param.get("TestBase");
@@ -89,7 +89,7 @@ public class OutProducerFactory {
* As a fallback, create a simple out producer, if all else failed.
* @return A simple out producer, writing to the screen.
*/
- public static LogWriter createSimpleOutProducer() {
+ private static LogWriter createSimpleOutProducer() {
return new SimpleOutProducer();
}
diff --git a/qadevOOo/runner/util/AccessibilityTools.java b/qadevOOo/runner/util/AccessibilityTools.java
index 3e4553755fa1..6b893106c65b 100644
--- a/qadevOOo/runner/util/AccessibilityTools.java
+++ b/qadevOOo/runner/util/AccessibilityTools.java
@@ -104,7 +104,7 @@ public class AccessibilityTools {
}
}
- public static XAccessibleContext getAccessibleObjectForRoleIgnoreShowing_(XAccessible xacc,
+ private static XAccessibleContext getAccessibleObjectForRoleIgnoreShowing_(XAccessible xacc,
short role) {
XAccessibleContext ac = xacc.getAccessibleContext();
if (ac == null) {
@@ -136,7 +136,7 @@ public class AccessibilityTools {
}
}
- public static XAccessibleContext getAccessibleObjectForRole_(XAccessible xacc,
+ private static XAccessibleContext getAccessibleObjectForRole_(XAccessible xacc,
short role) {
XAccessibleContext ac = xacc.getAccessibleContext();
boolean isShowing = ac.getAccessibleStateSet()
@@ -318,7 +318,7 @@ public class AccessibilityTools {
printAccessibleTree(log, xacc, "");
}
- protected static void printAccessibleTree(PrintWriter log,
+ private static void printAccessibleTree(PrintWriter log,
XAccessible xacc, String indent) {
XAccessibleContext ac = xacc.getAccessibleContext();
diff --git a/qadevOOo/runner/util/CalcTools.java b/qadevOOo/runner/util/CalcTools.java
index 3cc885e1107e..dd6defab8050 100644
--- a/qadevOOo/runner/util/CalcTools.java
+++ b/qadevOOo/runner/util/CalcTools.java
@@ -113,7 +113,7 @@ public class CalcTools {
* @return calc sheet
* @see com.sun.star.sheet.XSpreadsheet
*/
- public static XSpreadsheet getSpreadSheetFromSheetDoc(XComponent xSheetDoc, int sheetNumber)
+ private static XSpreadsheet getSpreadSheetFromSheetDoc(XComponent xSheetDoc, int sheetNumber)
throws java.lang.Exception {
XSpreadsheet xSheet = null;
diff --git a/qadevOOo/runner/util/DBTools.java b/qadevOOo/runner/util/DBTools.java
index e0bf47016e6e..5f22f5407dd2 100644
--- a/qadevOOo/runner/util/DBTools.java
+++ b/qadevOOo/runner/util/DBTools.java
@@ -191,7 +191,7 @@ public class DBTools {
* Prints datasource info.
* @param out Stream to which information is printed.
*/
- public void printInfo(PrintWriter out) {
+ private void printInfo(PrintWriter out) {
out.println("Name = '" + Name + "'") ;
out.println(" URL = '" + URL + "'") ;
out.print(" Info = ") ;
@@ -294,7 +294,7 @@ public class DBTools {
* @param dataSource <code>DataSource</code> object which is to
* be registered.
*/
- public void registerDB(String name, Object dataSource)
+ private void registerDB(String name, Object dataSource)
throws com.sun.star.uno.Exception {
dbContext.registerObject(name, dataSource) ;
@@ -424,7 +424,7 @@ public class DBTools {
* @return <code>com.sun.star.sdb.DataSource</code> service
* implementation which represents TestDB.
*/
- public Object registerTestDB(String docPath)
+ private Object registerTestDB(String docPath)
throws com.sun.star.uno.Exception {
String testURL = null ;
@@ -490,7 +490,7 @@ public class DBTools {
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
// Currently doesn't work because of bugs 85509, 85510
- public int deleteAllRows(XConnection con, String table)
+ private int deleteAllRows(XConnection con, String table)
throws com.sun.star.sdbc.SQLException {
XStatement stat = con.createStatement() ;
@@ -535,7 +535,7 @@ public class DBTools {
* </code> types specified. In this case the parameter specifies
* the length of the stream for inserting.
*/
- public void addRowToTestTable(XConnection con, String table, Object[] values,
+ private void addRowToTestTable(XConnection con, String table, Object[] values,
int streamLength)
throws com.sun.star.sdbc.SQLException {
@@ -698,7 +698,7 @@ public class DBTools {
* statement and obtaining the results produced by it.
* @param tbl_name Test table name.
*/
- protected void insertContentMySQLTable(Statement statement, String tbl_name)
+ private void insertContentMySQLTable(Statement statement, String tbl_name)
throws java.sql.SQLException {
@@ -746,7 +746,7 @@ public class DBTools {
* statement and obtaining the results produced by it.
* @param tbl_name Test table name.
*/
- protected void createMySQLTable(Statement statement, String tbl_name)
+ private void createMySQLTable(Statement statement, String tbl_name)
throws java.sql.SQLException {
final String empty_col_name = "Column";
@@ -794,7 +794,7 @@ public class DBTools {
* statement and obtaining the results produced by it.
* @param tbl_name Test table name.
*/
- protected void dropMySQLTable(Statement statement, String tbl_name)
+ private void dropMySQLTable(Statement statement, String tbl_name)
throws java.sql.SQLException {
statement.executeUpdate("drop table if exists " + tbl_name);
}
diff --git a/qadevOOo/runner/util/DesktopTools.java b/qadevOOo/runner/util/DesktopTools.java
index f790ad93924a..30bfd8725d43 100644
--- a/qadevOOo/runner/util/DesktopTools.java
+++ b/qadevOOo/runner/util/DesktopTools.java
@@ -56,7 +56,7 @@ public class DesktopTools
* @param xMSF the MultiServiceFactory
* @return the gained XComponentLoader
*/
- public static XComponentLoader getCLoader(XMultiServiceFactory xMSF)
+ private static XComponentLoader getCLoader(XMultiServiceFactory xMSF)
{
XDesktop oDesktop = UnoRuntime.queryInterface(
XDesktop.class, createDesktop(xMSF));
@@ -178,7 +178,7 @@ public class DesktopTools
* </ul>
* or <CODE>null</CODE>
*/
- public static String getDocumentType(XComponent xComponent)
+ private static String getDocumentType(XComponent xComponent)
{
XServiceInfo sInfo = UnoRuntime.queryInterface(
XServiceInfo.class, xComponent);
diff --git a/qadevOOo/runner/util/DrawTools.java b/qadevOOo/runner/util/DrawTools.java
index 05c5551c117d..acb89d88e26c 100644
--- a/qadevOOo/runner/util/DrawTools.java
+++ b/qadevOOo/runner/util/DrawTools.java
@@ -119,7 +119,7 @@ public class DrawTools {
* @return the created XShape
*/
- public XShape createShape( XComponent oDoc, int height, int width, int x,
+ private XShape createShape( XComponent oDoc, int height, int width, int x,
int y, String kind ) {
//possible values for kind are 'Ellipse', 'Line' and 'Rectangle'
diff --git a/qadevOOo/runner/util/DynamicClassLoader.java b/qadevOOo/runner/util/DynamicClassLoader.java
index dbb3dd7972c2..ff70becefbba 100644
--- a/qadevOOo/runner/util/DynamicClassLoader.java
+++ b/qadevOOo/runner/util/DynamicClassLoader.java
@@ -31,7 +31,7 @@ public class DynamicClassLoader {
* @param className The name of the class to create.
* @return The created class.
*/
- public static Class<?> forName(String className)
+ private static Class<?> forName(String className)
throws ClassNotFoundException {
return Class.forName(className) ;
diff --git a/qadevOOo/runner/util/FormTools.java b/qadevOOo/runner/util/FormTools.java
index 9b6a3ae6db6d..9064487f791c 100644
--- a/qadevOOo/runner/util/FormTools.java
+++ b/qadevOOo/runner/util/FormTools.java
@@ -184,7 +184,7 @@ public class FormTools {
return oFS.getForms();
} //finish getForms
- public static XIndexContainer getIndexedForms ( XDrawPage oDP )
+ private static XIndexContainer getIndexedForms ( XDrawPage oDP )
{
XFormsSupplier oFS = UnoRuntime.queryInterface(
XFormsSupplier.class,oDP);
diff --git a/qadevOOo/runner/util/RegistryTools.java b/qadevOOo/runner/util/RegistryTools.java
index 686411495feb..ff33c8c1442e 100644
--- a/qadevOOo/runner/util/RegistryTools.java
+++ b/qadevOOo/runner/util/RegistryTools.java
@@ -71,7 +71,7 @@ public class RegistryTools {
* return <code>true</code> if key names, value types
* and values are equal, else returns <code>false</code>.
*/
- public static boolean compareKeys
+ private static boolean compareKeys
(XRegistryKey key1, XRegistryKey key2) {
if (key1 == null || key2 == null ||
@@ -152,7 +152,7 @@ public class RegistryTools {
* @param keyName Full key name.
* @return Short key name.
*/
- public static String getShortKeyName(String keyName) {
+ private static String getShortKeyName(String keyName) {
if (keyName == null) return null ;
int idx = keyName.lastIndexOf("/") ;
if (idx < 0) return keyName ;
@@ -166,7 +166,7 @@ public class RegistryTools {
* comparing from children of root keys.
* @return <code>true</code> if keys and their sub keys are equal.
*/
- protected static boolean compareKeyTrees
+ private static boolean compareKeyTrees
(XRegistryKey tree1, XRegistryKey tree2, boolean compareRoot) {
if (compareRoot && !compareKeys(tree1, tree2)) return false ;
diff --git a/qadevOOo/runner/util/SOfficeFactory.java b/qadevOOo/runner/util/SOfficeFactory.java
index f6db1c696bcd..8a841397ee5c 100644
--- a/qadevOOo/runner/util/SOfficeFactory.java
+++ b/qadevOOo/runner/util/SOfficeFactory.java
@@ -590,7 +590,7 @@ public class SOfficeFactory {
} // finished openDoc
- public XComponent openDoc(String kind, String frameName, PropertyValue[] mediaDescriptor)
+ private XComponent openDoc(String kind, String frameName, PropertyValue[] mediaDescriptor)
throws com.sun.star.lang.IllegalArgumentException,
com.sun.star.io.IOException,
com.sun.star.uno.Exception {
diff --git a/qadevOOo/runner/util/UITools.java b/qadevOOo/runner/util/UITools.java
index 0df280360c83..c97c6d47c008 100644
--- a/qadevOOo/runner/util/UITools.java
+++ b/qadevOOo/runner/util/UITools.java
@@ -457,7 +457,7 @@ public class UITools {
* @throws java.lang.Exception if something fail
* @return the value of the named numeric filed
*/
- public String getNumericFieldValue(String NumericFieldName)
+ private String getNumericFieldValue(String NumericFieldName)
throws java.lang.Exception
{
try{
diff --git a/qadevOOo/runner/util/ValueComparer.java b/qadevOOo/runner/util/ValueComparer.java
index e9f9fa9d1473..dfc0768c5322 100644
--- a/qadevOOo/runner/util/ValueComparer.java
+++ b/qadevOOo/runner/util/ValueComparer.java
@@ -69,7 +69,7 @@ public class ValueComparer {
return eq;
} // end of equalValue
- static boolean compareArrayOfPropertyValue(PropertyValue[] pv1, PropertyValue[] pv2){
+ private static boolean compareArrayOfPropertyValue(PropertyValue[] pv1, PropertyValue[] pv2){
if ( pv1.length != pv2.length) {
return false;
}
@@ -89,7 +89,7 @@ public class ValueComparer {
return result;
}
- static boolean compareArrays(Object op1, Object op2) throws Exception {
+ private static boolean compareArrays(Object op1, Object op2) throws Exception {
if (op1 instanceof PropertyValue[] && op2 instanceof PropertyValue[]) {
return compareArrayOfPropertyValue((PropertyValue[])op1,(PropertyValue[])op2);
@@ -109,11 +109,11 @@ public class ValueComparer {
return result;
}
- static boolean compareInterfaces(XInterface op1, XInterface op2) {
+ private static boolean compareInterfaces(XInterface op1, XInterface op2) {
return op1 == op2;
}
- static boolean compareUntil(Class<?> zClass, Class<?> untilClass, Object op1, Object op2) throws Exception {
+ private static boolean compareUntil(Class<?> zClass, Class<?> untilClass, Object op1, Object op2) throws Exception {
boolean result = true;
// write inherited members first
@@ -156,7 +156,7 @@ public class ValueComparer {
return result;
}
- static boolean compareStructs(Object op1, Object op2) throws Exception {
+ private static boolean compareStructs(Object op1, Object op2) throws Exception {
boolean result = true;
if(op1.getClass() != op2.getClass())
@@ -168,7 +168,7 @@ public class ValueComparer {
return result;
}
- static boolean compareThrowable(Throwable op1, Throwable op2) throws Exception {
+ private static boolean compareThrowable(Throwable op1, Throwable op2) throws Exception {
boolean result = true;
if(op1.getClass() != op2.getClass())
@@ -182,11 +182,11 @@ public class ValueComparer {
return result;
}
- static boolean compareEnums(Enum en1, Enum en2) {
+ private static boolean compareEnums(Enum en1, Enum en2) {
return en1.getValue() == en2.getValue();
}
- static boolean compareObjects(Object op1, Object op2) throws Exception {
+ private static boolean compareObjects(Object op1, Object op2) throws Exception {
boolean result = false;
if(op1 == op2)
diff --git a/qadevOOo/runner/util/WriterTools.java b/qadevOOo/runner/util/WriterTools.java
index 77ca32fd68e2..aec10a16ba4d 100644
--- a/qadevOOo/runner/util/WriterTools.java
+++ b/qadevOOo/runner/util/WriterTools.java
@@ -51,7 +51,7 @@ public class WriterTools {
return WriterDoc;
} // finish createTextDoc
- public static XTextDocument loadTextDoc(XMultiServiceFactory xMSF,
+ private static XTextDocument loadTextDoc(XMultiServiceFactory xMSF,
String url, PropertyValue[] Args) {
XComponent comp = DesktopTools.loadDoc(xMSF, url, Args);
XTextDocument WriterDoc = UnoRuntime.queryInterface(
diff --git a/qadevOOo/runner/util/XMLTools.java b/qadevOOo/runner/util/XMLTools.java
index 1b8ccf183ea2..f706d9c5878a 100644
--- a/qadevOOo/runner/util/XMLTools.java
+++ b/qadevOOo/runner/util/XMLTools.java
@@ -275,7 +275,7 @@ public class XMLTools {
* Reset all values. This is important e.g. for test of XFilter
* interface, where 'filter()' method istbstarted twice.
*/
- public void reset() {
+ void reset() {
docStarted = false ;
docEnded = false ;
tagStack = new ArrayList<String>() ;
@@ -352,7 +352,7 @@ public class XMLTools {
* Also prints "Tag trace" in case if the full XML data isn't
* printed.
*/
- public void printError(String msg) {
+ void printError(String msg) {
log.println("!!! Error: " + msg) ;
if (printXMLData) return ;
log.println(" Tag trace :") ;
@@ -586,7 +586,7 @@ public class XMLTools {
return ret ;
}
- protected boolean checkAttr(int attrListIdx, XAttributeList list) {
+ private boolean checkAttr(int attrListIdx, XAttributeList list) {
short j = 0 ;
int listLen = list.getLength();
while(j < listLen) {
@@ -609,7 +609,7 @@ public class XMLTools {
* with values method checks if these attributes exist and
* have appropriate values.
*/
- public boolean isMatchTo(String tagName, XAttributeList list) {
+ private boolean isMatchTo(String tagName, XAttributeList list) {
if (!name.equals(tagName)) return false;
boolean result = true ;
for (int i = 0; i < attrList.length; i++) {
@@ -813,7 +813,7 @@ public class XMLTools {
* XML data is written.
* @return SAX handler to which XML data has to be written.
*/
- public static XDocumentHandler getFileXMLWriter(XMultiServiceFactory xMSF, String fileURL)
+ private static XDocumentHandler getFileXMLWriter(XMultiServiceFactory xMSF, String fileURL)
throws com.sun.star.uno.Exception
{
XInterface oFacc = (XInterface)xMSF.createInstance(
@@ -842,7 +842,7 @@ public class XMLTools {
* @param handler SAX handler to which XML data from file will
* be transferred.
*/
- public static void parseXMLFile(XMultiServiceFactory xMSF,
+ private static void parseXMLFile(XMultiServiceFactory xMSF,
String fileURL, XDocumentHandler handler) throws com.sun.star.uno.Exception
{
XInterface oFacc = (XInterface)xMSF.createInstance(
diff --git a/qadevOOo/runner/util/compare/GraphicalComparator.java b/qadevOOo/runner/util/compare/GraphicalComparator.java
index 47b99b8aa218..f52e8f0bbfd7 100644
--- a/qadevOOo/runner/util/compare/GraphicalComparator.java
+++ b/qadevOOo/runner/util/compare/GraphicalComparator.java
@@ -75,7 +75,7 @@ class GraphicalComparator implements DocComparator
* replacing the path equals to _sInputPath with _sReferencePath and replace it's suffix by _sNewSuffix.
* If _sInputPath is empty, replace the whole path by _sReferencePath.
*/
- protected String createSpecialFile(String _sEntry, String _sInputPath, String _sReferencePath, String _sNewSuffix)
+ private String createSpecialFile(String _sEntry, String _sInputPath, String _sReferencePath, String _sNewSuffix)
{
String fs = System.getProperty("file.separator");
String sNewSubDir = "";
@@ -100,7 +100,7 @@ class GraphicalComparator implements DocComparator
return sNewReferencePath;
}
- boolean isReferenceOrDiffExistent(String _sNewSuffix)
+ private boolean isReferenceOrDiffExistent(String _sNewSuffix)
{
boolean isExistent = false;
diff --git a/qadevOOo/runner/util/dbg.java b/qadevOOo/runner/util/dbg.java
index 43a25668c1b8..99b0929bfbb4 100644
--- a/qadevOOo/runner/util/dbg.java
+++ b/qadevOOo/runner/util/dbg.java
@@ -54,7 +54,7 @@ public class dbg {
* @param extendedInfo Should extended information be printed?
* @see com.sun.star.uno.XInterface
*/
- public static void printInterfaces(XInterface xTarget,
+ private static void printInterfaces(XInterface xTarget,
boolean extendedInfo){
Type[] types = getInterfaceTypes(xTarget);
if( null != types ) {
@@ -75,7 +75,7 @@ public class dbg {
* @return An array with all interface types; null if there are none.
* @see com.sun.star.uno.XInterface
*/
- public static Type[] getInterfaceTypes(XInterface xTarget) {
+ private static Type[] getInterfaceTypes(XInterface xTarget) {
Type[] types = null;
XTypeProvider xTypeProvider = UnoRuntime.queryInterface( XTypeProvider.class, xTarget);
if( xTypeProvider != null )
@@ -113,7 +113,7 @@ public class dbg {
* @param aType The type of the given interface.
* @see com.sun.star.uno.Type
*/
- public static void printInterfaceInfo(Type aType) {
+ private static void printInterfaceInfo(Type aType) {
try {
Class<?> zClass = aType.getZClass();
Method[] methods = zClass.getDeclaredMethods();
@@ -223,7 +223,7 @@ public class dbg {
* @param out The print writer which is used as output.
* @see com.sun.star.beans.PropertyValue
*/
- public static void printProperyValueSequenzePairs(PropertyValue[] ps, PrintWriter out){
+ private static void printProperyValueSequenzePairs(PropertyValue[] ps, PrintWriter out){
for( int i = 0; i < ps.length; i++){
printProperyValuePairs(ps[i], out);
}
@@ -244,7 +244,7 @@ public class dbg {
* @param out The print writer which is used as output.
* @see com.sun.star.beans.PropertyValue
*/
- public static void printProperyValuePairs(PropertyValue ps, PrintWriter out){
+ private static void printProperyValuePairs(PropertyValue ps, PrintWriter out){
if (ps.Value instanceof String[] ){
String[] values = (String[]) ps.Value;
diff --git a/qadevOOo/runner/util/utils.java b/qadevOOo/runner/util/utils.java
index 183daadee8dc..73664ce6989a 100644
--- a/qadevOOo/runner/util/utils.java
+++ b/qadevOOo/runner/util/utils.java
@@ -286,7 +286,7 @@ public class utils {
* @see com.sun.star.util.PathSettings
* @return the value as String
*/
- public static String getOfficeSettingsValue(XMultiServiceFactory msf, String setting) {
+ private static String getOfficeSettingsValue(XMultiServiceFactory msf, String setting) {
String settingPath = null;
try {
@@ -813,7 +813,7 @@ public class utils {
* @param checkAppExecutionCommand If the AppExecutionCommand is checked, the error messages willbe different.
* @return The error message, or OK, if no error was detected.
*/
- public static String validateConnectString(String connectString, boolean checkAppExecutionCommand) {
+ private static String validateConnectString(String connectString, boolean checkAppExecutionCommand) {
String acceptPrefix = "";
if (checkAppExecutionCommand) {
acceptPrefix = "--accept=";
@@ -926,7 +926,7 @@ public class utils {
* @param URL the <CODE>URL</CODE> to dispatch
* @throws java.lang.Exception throws <CODE>java.lang.Exception</CODE> on any error
*/
- public static void dispatchURL(XMultiServiceFactory xMSF, XController xCont, String URL) throws java.lang.Exception {
+ private static void dispatchURL(XMultiServiceFactory xMSF, XController xCont, String URL) throws java.lang.Exception {
try {
XDispatchProvider xDispProv = UnoRuntime.queryInterface(XDispatchProvider.class, xCont);