diff options
Diffstat (limited to 'qadevOOo')
49 files changed, 168 insertions, 168 deletions
diff --git a/qadevOOo/runner/complexlib/ComplexTestCase.java b/qadevOOo/runner/complexlib/ComplexTestCase.java index bca42faa0fbc..3df834d97236 100644 --- a/qadevOOo/runner/complexlib/ComplexTestCase.java +++ b/qadevOOo/runner/complexlib/ComplexTestCase.java @@ -38,11 +38,11 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest /** * The method name which will be written into f.e. the data base **/ - protected String mTestMethodName = null; + private String mTestMethodName = null; /** Maximal time one method is allowed to execute * Can be set with parameter 'ThreadTimeOut' **/ - protected int m_nThreadTimeOut = 0; + private int m_nThreadTimeOut = 0; /** End a test if it did fail **/ public static final boolean BREAK = true; diff --git a/qadevOOo/runner/convwatch/BorderRemover.java b/qadevOOo/runner/convwatch/BorderRemover.java index c96b8f4853ec..e1f75a22122e 100644 --- a/qadevOOo/runner/convwatch/BorderRemover.java +++ b/qadevOOo/runner/convwatch/BorderRemover.java @@ -27,10 +27,10 @@ import java.lang.reflect.Method; class Rect { - int x; - int y; - int w; - int h; + private int x; + private int y; + private int w; + private int h; public Rect(int _x, int _y, int _w, int _h) { @@ -47,7 +47,7 @@ class Rect class BorderRemover { - ImageHelper m_aImage; + private ImageHelper m_aImage; // Helper values, filled after find Border diff --git a/qadevOOo/runner/convwatch/DBHelper.java b/qadevOOo/runner/convwatch/DBHelper.java index 844e3359045d..f94e7274ce57 100644 --- a/qadevOOo/runner/convwatch/DBHelper.java +++ b/qadevOOo/runner/convwatch/DBHelper.java @@ -53,8 +53,8 @@ class ShareConnection class MySQLThread extends Thread { - Connection m_aCon = null; - String m_sSQL; + private Connection m_aCon = null; + private String m_sSQL; public MySQLThread(Connection _aCon, String _sSQL) { m_aCon = _aCon; diff --git a/qadevOOo/runner/convwatch/DirectoryHelper.java b/qadevOOo/runner/convwatch/DirectoryHelper.java index 60896af030b8..02a81d94d7df 100644 --- a/qadevOOo/runner/convwatch/DirectoryHelper.java +++ b/qadevOOo/runner/convwatch/DirectoryHelper.java @@ -27,8 +27,8 @@ import java.util.ArrayList; */ public class DirectoryHelper { - ArrayList<String> m_aFileList = new ArrayList<String>(); - boolean m_bRecursiveIsAllowed = true; + private ArrayList<String> m_aFileList = new ArrayList<String>(); + private boolean m_bRecursiveIsAllowed = true; void setRecursiveIsAllowed(boolean _bValue) { diff --git a/qadevOOo/runner/convwatch/FilenameHelper.java b/qadevOOo/runner/convwatch/FilenameHelper.java index 1822232fc205..c26e8ee99921 100644 --- a/qadevOOo/runner/convwatch/FilenameHelper.java +++ b/qadevOOo/runner/convwatch/FilenameHelper.java @@ -42,11 +42,11 @@ interface Filenamer abstract class FilenameHelper_impl implements Filenamer { - String fs; // file separator like '/' - String m_sPath; - String m_sFilename; - String m_sSuffix; - int m_nNumber = 0; + private String fs; // file separator like '/' + private String m_sPath; + private String m_sFilename; + private String m_sSuffix; + private int m_nNumber = 0; public String getNumber() { diff --git a/qadevOOo/runner/convwatch/GraphicalTestArguments.java b/qadevOOo/runner/convwatch/GraphicalTestArguments.java index 338524324120..16062bd3629c 100644 --- a/qadevOOo/runner/convwatch/GraphicalTestArguments.java +++ b/qadevOOo/runner/convwatch/GraphicalTestArguments.java @@ -67,37 +67,37 @@ public class GraphicalTestArguments // pdf // msoffice */ - String m_sReferenceType = "OOo"; + private String m_sReferenceType = "OOo"; - String m_sTargetFrameName = "_blank"; + private String m_sTargetFrameName = "_blank"; - String m_sPrinterName = null; + private String m_sPrinterName = null; // Hidden = true hiddes a used OpenOffice.org, all code is executed in the background // This parameter is not used for RefType: msoffice - boolean m_bHidden = true; + private boolean m_bHidden = true; - String m_sDefaultXMLFormatApplication = null; + private String m_sDefaultXMLFormatApplication = null; - boolean m_bIncludeSubdirectories; + private boolean m_bIncludeSubdirectories; - TestParameters m_aCurrentParams; + private TestParameters m_aCurrentParams; - int m_nMaxPages = 0; // default is 0 (print all pages) + private int m_nMaxPages = 0; // default is 0 (print all pages) String m_sOnlyPage = ""; // default is "", there is no page which we want to print only. - int m_nResolutionInDPI = 0; + private int m_nResolutionInDPI = 0; - boolean m_bStoreFile = true; - boolean m_bResuseOffice = false; + private boolean m_bStoreFile = true; + private boolean m_bResuseOffice = false; boolean m_bDebugMode = false; - String m_sLeaveOutNames = null; + private String m_sLeaveOutNames = null; - String m_sDistinct = null; + private String m_sDistinct = null; - boolean m_bCreateDefaultReference = false; + private boolean m_bCreateDefaultReference = false; public GraphicalTestArguments(TestParameters param) { @@ -563,8 +563,8 @@ public class GraphicalTestArguments // get the right Filtername (internal Name) from // http://framework.openoffice.org/files/documents/25/897/filter_description.html - String m_sImportFilterName = ""; - String m_sExportFilterName = ""; + private String m_sImportFilterName = ""; + private String m_sExportFilterName = ""; public void setImportFilterName(String _sImportFilterName) { m_sImportFilterName = _sImportFilterName; @@ -582,7 +582,7 @@ public class GraphicalTestArguments return m_sExportFilterName; } - String m_sOfficeProgram = ""; + private String m_sOfficeProgram = ""; public void setOfficeProgram(String _sName) { m_sOfficeProgram = _sName; @@ -601,13 +601,13 @@ public class GraphicalTestArguments return false; } - String m_sHTMLOutputPrefix = ""; + private String m_sHTMLOutputPrefix = ""; public String getHTMLOutputPrefix() { return m_sHTMLOutputPrefix; } - TriState m_tWithBorderMove = TriState.UNSET; + private TriState m_tWithBorderMove = TriState.UNSET; public TriState getBorderMove() { return m_tWithBorderMove; @@ -617,7 +617,7 @@ public class GraphicalTestArguments m_tWithBorderMove = _tBorderMove; } - String m_sDocumentType = ""; + private String m_sDocumentType = ""; public void setDocumentType(String _sName) { m_sDocumentType = _sName; @@ -630,7 +630,7 @@ public class GraphicalTestArguments /* helper class for performance analyser features */ - PerformanceContainer m_aPerformanceContainer = null; + private PerformanceContainer m_aPerformanceContainer = null; public PerformanceContainer getPerformance() { if (m_aPerformanceContainer == null) diff --git a/qadevOOo/runner/convwatch/HTMLOutputter.java b/qadevOOo/runner/convwatch/HTMLOutputter.java index 2dea50fec6e0..828d76bda74f 100644 --- a/qadevOOo/runner/convwatch/HTMLOutputter.java +++ b/qadevOOo/runner/convwatch/HTMLOutputter.java @@ -24,14 +24,14 @@ import helper.OSHelper; public class HTMLOutputter { - FileWriter m_aOut; - String m_sFilename; - String m_sNamePrefix; // the HTML files used a suffix to build it's right name + private FileWriter m_aOut; + private String m_sFilename; + private String m_sNamePrefix; // the HTML files used a suffix to build it's right name /** * ls is the current line separator (carridge return) */ - String ls; + private String ls; HTMLOutputter() {} public static HTMLOutputter create( String _sOutputPath, String _sHTMLFilename, String _sNamePrefix ) diff --git a/qadevOOo/runner/convwatch/INIOutputter.java b/qadevOOo/runner/convwatch/INIOutputter.java index 30d6a0d913f7..0851a9561302 100644 --- a/qadevOOo/runner/convwatch/INIOutputter.java +++ b/qadevOOo/runner/convwatch/INIOutputter.java @@ -23,14 +23,14 @@ import java.io.FileWriter; public class INIOutputter { - FileWriter m_aOut; - String m_sFilename; - String m_sNamePrefix; // the HTML files used a suffix to build it's right name + private FileWriter m_aOut; + private String m_sFilename; + private String m_sNamePrefix; // the HTML files used a suffix to build it's right name /** * ls is the current line separator (carridge return) */ - String ls; + private String ls; public static INIOutputter create( String _sOutputPath, String _sHTMLFilename, String _sNamePrefix ) { diff --git a/qadevOOo/runner/convwatch/ImageHelper.java b/qadevOOo/runner/convwatch/ImageHelper.java index 79c5d5cc1fdd..c5b2f11c0093 100644 --- a/qadevOOo/runner/convwatch/ImageHelper.java +++ b/qadevOOo/runner/convwatch/ImageHelper.java @@ -26,11 +26,11 @@ import java.lang.reflect.Method; class ImageHelper { - Image m_aImage; - int[] m_aPixels; - int m_w = 0; - int m_h = 0; - boolean m_bGrabbed = false; + private Image m_aImage; + private int[] m_aPixels; + private int m_w = 0; + private int m_h = 0; + private boolean m_bGrabbed = false; private ImageHelper(Image _aImage) { diff --git a/qadevOOo/runner/convwatch/IniFile.java b/qadevOOo/runner/convwatch/IniFile.java index 58f39e9e4c38..404751328f01 100644 --- a/qadevOOo/runner/convwatch/IniFile.java +++ b/qadevOOo/runner/convwatch/IniFile.java @@ -32,9 +32,9 @@ class IniFile * internal representation of the ini file content. * Problem, if ini file changed why other write something difference, we don't realise this. */ - String m_sFilename; - ArrayList<String> m_aList; - boolean m_bListContainUnsavedChanges = false; + private String m_sFilename; + private ArrayList<String> m_aList; + private boolean m_bListContainUnsavedChanges = false; /** open a ini file by its name diff --git a/qadevOOo/runner/convwatch/LISTOutputter.java b/qadevOOo/runner/convwatch/LISTOutputter.java index 23a83198b396..3053953f1f3c 100644 --- a/qadevOOo/runner/convwatch/LISTOutputter.java +++ b/qadevOOo/runner/convwatch/LISTOutputter.java @@ -23,13 +23,13 @@ import java.io.FileWriter; public class LISTOutputter { - FileWriter m_aOut; - String m_sFilename; + private FileWriter m_aOut; + private String m_sFilename; /** * ls is the current line separator (carridge return) */ - String ls; + private String ls; public static LISTOutputter create( String _sOutputPath, String _sFilename) { diff --git a/qadevOOo/runner/convwatch/PRNCompare.java b/qadevOOo/runner/convwatch/PRNCompare.java index 38955f252004..ff676ea18fb3 100644 --- a/qadevOOo/runner/convwatch/PRNCompare.java +++ b/qadevOOo/runner/convwatch/PRNCompare.java @@ -32,7 +32,7 @@ import java.util.ArrayList; public class PRNCompare { - String fs; + private String fs; public PRNCompare() { @@ -91,16 +91,16 @@ public class PRNCompare return nMaxNumber; } - String m_sInputPath; - String m_sReferencePath; - String m_sOutputPath; - String m_sDocFile; - String m_sReferenceFile; - String m_sPostScriptFile; - int m_nMaxPages = 0; - int m_nResolutionInDPI = 0; - TriState m_tUseBorderMove; - String m_sDocumentType; + private String m_sInputPath; + private String m_sReferencePath; + private String m_sOutputPath; + private String m_sDocFile; + private String m_sReferenceFile; + private String m_sPostScriptFile; + private int m_nMaxPages = 0; + private int m_nResolutionInDPI = 0; + private TriState m_tUseBorderMove; + private String m_sDocumentType; public void setInputPath(String _sInputPath) { m_sInputPath = _sInputPath; } diff --git a/qadevOOo/runner/convwatch/PixelCounter.java b/qadevOOo/runner/convwatch/PixelCounter.java index 63523f60047e..6e41bca6232e 100644 --- a/qadevOOo/runner/convwatch/PixelCounter.java +++ b/qadevOOo/runner/convwatch/PixelCounter.java @@ -125,7 +125,7 @@ class graphics_stuff public class PixelCounter { - ImageHelper m_aImage; + private ImageHelper m_aImage; public int countNotWhitePixel(String _sFile) diff --git a/qadevOOo/runner/convwatch/TriState.java b/qadevOOo/runner/convwatch/TriState.java index 835ff6e67b66..5c27afa4153f 100644 --- a/qadevOOo/runner/convwatch/TriState.java +++ b/qadevOOo/runner/convwatch/TriState.java @@ -24,7 +24,7 @@ public class TriState public static final TriState FALSE = new TriState(0); public static final TriState UNSET = new TriState(-1); - int m_nValue; + private int m_nValue; /** Allocates a <code>TriState</code> object representing the diff --git a/qadevOOo/runner/graphical/DirectoryHelper.java b/qadevOOo/runner/graphical/DirectoryHelper.java index 0033de9853d5..ca36ef8b0839 100644 --- a/qadevOOo/runner/graphical/DirectoryHelper.java +++ b/qadevOOo/runner/graphical/DirectoryHelper.java @@ -27,8 +27,8 @@ import java.util.ArrayList; */ public class DirectoryHelper { - ArrayList<String> m_aFileList = new ArrayList<String>(); - boolean m_bRecursiveIsAllowed = true; + private ArrayList<String> m_aFileList = new ArrayList<String>(); + private boolean m_bRecursiveIsAllowed = true; void setRecursiveIsAllowed(boolean _bValue) { diff --git a/qadevOOo/runner/graphical/ImageHelper.java b/qadevOOo/runner/graphical/ImageHelper.java index e06a6880f27b..ec2a5cee573d 100644 --- a/qadevOOo/runner/graphical/ImageHelper.java +++ b/qadevOOo/runner/graphical/ImageHelper.java @@ -26,11 +26,11 @@ import java.lang.reflect.Method; class ImageHelper { - Image m_aImage; - int[] m_aPixels; - int m_w = 0; - int m_h = 0; - boolean m_bGrabbed = false; + private Image m_aImage; + private int[] m_aPixels; + private int m_w = 0; + private int m_h = 0; + private boolean m_bGrabbed = false; private ImageHelper(Image _aImage) { diff --git a/qadevOOo/runner/graphical/IniFile.java b/qadevOOo/runner/graphical/IniFile.java index 9640e6076a73..30b38c3b15e8 100644 --- a/qadevOOo/runner/graphical/IniFile.java +++ b/qadevOOo/runner/graphical/IniFile.java @@ -35,7 +35,7 @@ public class IniFile implements Enumeration<String> */ private String m_sFilename; private ArrayList<String> m_aList; - boolean m_bListContainUnsavedChanges = false; + private boolean m_bListContainUnsavedChanges = false; private int m_aEnumerationPos = 0; /** diff --git a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java index 05de2b8a5f9c..f6d1d3fcf922 100644 --- a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java +++ b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java @@ -1003,7 +1003,7 @@ public class OpenOfficePostscriptCreator implements IOffice } - OfficeProvider m_aProvider = null; + private OfficeProvider m_aProvider = null; private void startOffice() { m_aParameterHelper.getTestParameters().put(util.PropertyName.DONT_BACKUP_USERLAYER, Boolean.TRUE); diff --git a/qadevOOo/runner/graphical/ParameterHelper.java b/qadevOOo/runner/graphical/ParameterHelper.java index 8839a728dec8..418c06a6b3d1 100644 --- a/qadevOOo/runner/graphical/ParameterHelper.java +++ b/qadevOOo/runner/graphical/ParameterHelper.java @@ -181,7 +181,7 @@ public class ParameterHelper return m_sPrinterName; } - PerformanceContainer m_aPerformanceContainer = null; + private PerformanceContainer m_aPerformanceContainer = null; /** * helper class for performance analyser features */ @@ -261,8 +261,8 @@ public class ParameterHelper // get the right Filtername (internal Name) from // http://framework.openoffice.org/files/documents/25/897/filter_description.html - String m_sImportFilterName = ""; - String m_sExportFilterName = ""; + private String m_sImportFilterName = ""; + private String m_sExportFilterName = ""; public void setImportFilterName(String _sImportFilterName) { m_sImportFilterName = _sImportFilterName; @@ -279,7 +279,7 @@ public class ParameterHelper { return m_sExportFilterName; } - String m_sDocumentType = ""; + private String m_sDocumentType = ""; public void setDocumentType(String _sName) { m_sDocumentType = _sName; diff --git a/qadevOOo/runner/helper/CfgParser.java b/qadevOOo/runner/helper/CfgParser.java index f34b4e6fb0a5..bda0cf09d9b3 100644 --- a/qadevOOo/runner/helper/CfgParser.java +++ b/qadevOOo/runner/helper/CfgParser.java @@ -33,8 +33,8 @@ import util.PropertyName; public class CfgParser { - protected boolean debug = false; - protected String iniFile = ""; + private boolean debug = false; + private String iniFile = ""; public CfgParser(String ini) { diff --git a/qadevOOo/runner/helper/ConfigurationRead.java b/qadevOOo/runner/helper/ConfigurationRead.java index 5a3e476421dc..bde788a5e687 100644 --- a/qadevOOo/runner/helper/ConfigurationRead.java +++ b/qadevOOo/runner/helper/ConfigurationRead.java @@ -30,7 +30,7 @@ import com.sun.star.uno.UnoRuntime; */ public class ConfigurationRead { - XHierarchicalNameAccess root = null; + private XHierarchicalNameAccess root = null; /** * Creates new ConfigurationRead diff --git a/qadevOOo/runner/helper/LoggingThread.java b/qadevOOo/runner/helper/LoggingThread.java index 41e97845fc2d..9869e7885b9d 100644 --- a/qadevOOo/runner/helper/LoggingThread.java +++ b/qadevOOo/runner/helper/LoggingThread.java @@ -36,10 +36,10 @@ import util.utils; */ public class LoggingThread extends Thread { - TestParameters param; - LogWriter log = null; - boolean finished = false; - boolean debug = false; + private TestParameters param; + private LogWriter log = null; + private boolean finished = false; + private boolean debug = false; public LoggingThread(LogWriter log, TestParameters tParam) { this.log = log; diff --git a/qadevOOo/runner/helper/StreamSimulator.java b/qadevOOo/runner/helper/StreamSimulator.java index 4352ca8eaf49..205925dcb9f1 100644 --- a/qadevOOo/runner/helper/StreamSimulator.java +++ b/qadevOOo/runner/helper/StreamSimulator.java @@ -51,8 +51,8 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , private com.sun.star.io.XOutputStream m_xOutStream ; private com.sun.star.io.XSeekable m_xSeek ; - public boolean m_bInWasUsed ; - public boolean m_bOutWasUsed ; + private boolean m_bInWasUsed ; + private boolean m_bOutWasUsed ; /** diff --git a/qadevOOo/runner/helper/WindowListener.java b/qadevOOo/runner/helper/WindowListener.java index 602bebbfdb8f..e1622327a069 100644 --- a/qadevOOo/runner/helper/WindowListener.java +++ b/qadevOOo/runner/helper/WindowListener.java @@ -31,15 +31,15 @@ package helper; public class WindowListener implements com.sun.star.awt.XWindowListener { // hidden called - public boolean hiddenTrigger; + private boolean hiddenTrigger; // move called - public boolean movedTrigger; + private boolean movedTrigger; // resize called public boolean resizedTrigger; // show called - public boolean shownTrigger; + private boolean shownTrigger; // dispose called - public boolean disposeTrigger; + private boolean disposeTrigger; /** * Creates a new WindowListener diff --git a/qadevOOo/runner/lib/Parameters.java b/qadevOOo/runner/lib/Parameters.java index 6901323e9641..900646fcb807 100644 --- a/qadevOOo/runner/lib/Parameters.java +++ b/qadevOOo/runner/lib/Parameters.java @@ -37,9 +37,9 @@ import com.sun.star.uno.Type; * Parameters is a container of String parameters. */ public class Parameters implements XPropertySet { - final protected Map<String, Object> parameters; - final Parameters defaults; - Property[] props; + final private Map<String, Object> parameters; + private final Parameters defaults; + private Property[] props; public Parameters(Map<String, Object> params) { this (params, null); diff --git a/qadevOOo/runner/lib/SimpleStatus.java b/qadevOOo/runner/lib/SimpleStatus.java index cafdc3208db2..2639faea50d1 100644 --- a/qadevOOo/runner/lib/SimpleStatus.java +++ b/qadevOOo/runner/lib/SimpleStatus.java @@ -66,12 +66,12 @@ class SimpleStatus { /** * The field is holding state of the status. */ - protected final boolean state; + private final boolean state; /** * The field is holding reason of the status. */ - protected final int runState; + private final int runState; /** * This is the run state: either SKIPPED, PASSED, etc. diff --git a/qadevOOo/runner/lib/StatusException.java b/qadevOOo/runner/lib/StatusException.java index a238319f968c..c9658926bca9 100644 --- a/qadevOOo/runner/lib/StatusException.java +++ b/qadevOOo/runner/lib/StatusException.java @@ -27,7 +27,7 @@ public class StatusException extends RuntimeException { /** * The Status contained in the StatusException. */ - protected Status status; + private Status status; /** * Constructs a StatusException containing an exception Status. diff --git a/qadevOOo/runner/stats/DataBaseOutProducer.java b/qadevOOo/runner/stats/DataBaseOutProducer.java index 129d1dd6bb55..b36dcfc07c98 100644 --- a/qadevOOo/runner/stats/DataBaseOutProducer.java +++ b/qadevOOo/runner/stats/DataBaseOutProducer.java @@ -24,9 +24,9 @@ import java.util.HashMap; public abstract class DataBaseOutProducer implements LogWriter { protected HashMap<String,Object> mSqlInput = null; - protected HashMap<String, String[]> mSqlOutput = null; - protected String[] mWriteableEntryTypes = null; - protected SQLExecution mSqlExec; + private HashMap<String, String[]> mSqlOutput = null; + private String[] mWriteableEntryTypes = null; + private SQLExecution mSqlExec; protected boolean m_bDebug = false; diff --git a/qadevOOo/runner/stats/InternalLogWriter.java b/qadevOOo/runner/stats/InternalLogWriter.java index 7c4f988b281a..5c2d165a167d 100644 --- a/qadevOOo/runner/stats/InternalLogWriter.java +++ b/qadevOOo/runner/stats/InternalLogWriter.java @@ -27,9 +27,9 @@ import java.io.StringWriter; public class InternalLogWriter extends PrintWriter implements share.LogWriter { /** log active **/ - boolean active; + private boolean active; /** write all output to a StringBuffer **/ - static StringWriter writer = new StringWriter(); + private static StringWriter writer = new StringWriter(); /** * c'*tor diff --git a/qadevOOo/runner/stats/SQLExecution.java b/qadevOOo/runner/stats/SQLExecution.java index 1401156e6d82..9c6dca8a69c9 100644 --- a/qadevOOo/runner/stats/SQLExecution.java +++ b/qadevOOo/runner/stats/SQLExecution.java @@ -32,14 +32,14 @@ import java.util.StringTokenizer; */ public class SQLExecution { - protected Connection mConnection = null; - protected Statement mStatement = null; - protected String mJdbcClass = null; - protected String mDbURL = null; - protected String mUser = null; - protected String mPassword = null; - protected boolean m_bConnectionOpen = false; - protected boolean m_bDebug = false; + private Connection mConnection = null; + private Statement mStatement = null; + private String mJdbcClass = null; + private String mDbURL = null; + private String mUser = null; + private String mPassword = null; + private boolean m_bConnectionOpen = false; + private boolean m_bDebug = false; /** Creates a new instance of SQLExecution diff --git a/qadevOOo/runner/stats/SimpleLogWriter.java b/qadevOOo/runner/stats/SimpleLogWriter.java index b3a236fa798e..46e0e69a5c25 100644 --- a/qadevOOo/runner/stats/SimpleLogWriter.java +++ b/qadevOOo/runner/stats/SimpleLogWriter.java @@ -26,9 +26,9 @@ import java.util.GregorianCalendar; public class SimpleLogWriter extends PrintWriter implements LogWriter { - boolean m_bLogging = false; - share.DescEntry entry = null; - share.Watcher ow = null; + private boolean m_bLogging = false; + private share.DescEntry entry = null; + private share.Watcher ow = null; public SimpleLogWriter() { super(System.out); diff --git a/qadevOOo/runner/util/BookmarkDsc.java b/qadevOOo/runner/util/BookmarkDsc.java index 5eb821318380..6772f1ce4cc1 100644 --- a/qadevOOo/runner/util/BookmarkDsc.java +++ b/qadevOOo/runner/util/BookmarkDsc.java @@ -27,8 +27,8 @@ import com.sun.star.text.XTextContent; */ public class BookmarkDsc extends InstDescr { - final String service = "com.sun.star.text.Bookmark"; - String ifcName = "com.sun.star.text.XTextContent"; + private final String service = "com.sun.star.text.Bookmark"; + private String ifcName = "com.sun.star.text.XTextContent"; private String name = null; diff --git a/qadevOOo/runner/util/DBTools.java b/qadevOOo/runner/util/DBTools.java index 43aa834cb1d7..e0bf47016e6e 100644 --- a/qadevOOo/runner/util/DBTools.java +++ b/qadevOOo/runner/util/DBTools.java @@ -137,19 +137,19 @@ public class DBTools { /** * Representation of <code>'SuppressVersionColumns'</code> property. */ - public Boolean SuppressVersionColumns = null ; + private Boolean SuppressVersionColumns = null ; /** * Representation of <code>'IsReadOnly'</code> property. */ - public Boolean IsReadOnly = null ; + private Boolean IsReadOnly = null ; /** * Representation of <code>'TableFilter'</code> property. */ - public String[] TableFilter = null ; + private String[] TableFilter = null ; /** * Representation of <code>'TableTypeFilter'</code> property. */ - public String[] TableTypeFilter = null ; + private String[] TableTypeFilter = null ; /** * Creates an empty instance. diff --git a/qadevOOo/runner/util/DefaultDsc.java b/qadevOOo/runner/util/DefaultDsc.java index 9aedebb11008..8090fad5c2a2 100644 --- a/qadevOOo/runner/util/DefaultDsc.java +++ b/qadevOOo/runner/util/DefaultDsc.java @@ -29,8 +29,8 @@ import com.sun.star.uno.UnoRuntime; public class DefaultDsc extends InstDescr { private String name = null; - String ifcName = null; - String service = null; + private String ifcName = null; + private String service = null; public DefaultDsc( String Interface, String kind ) { service = kind; diff --git a/qadevOOo/runner/util/FootnoteDsc.java b/qadevOOo/runner/util/FootnoteDsc.java index 3e9fb89f2867..7ff9f6b7a42a 100644 --- a/qadevOOo/runner/util/FootnoteDsc.java +++ b/qadevOOo/runner/util/FootnoteDsc.java @@ -27,8 +27,8 @@ import com.sun.star.text.XTextContent; */ public class FootnoteDsc extends InstDescr { - final String service = "com.sun.star.text.Footnote"; - String ifcName = "com.sun.star.text.XTextContent"; + private final String service = "com.sun.star.text.Footnote"; + private String ifcName = "com.sun.star.text.XTextContent"; private String name = null; diff --git a/qadevOOo/runner/util/FrameDsc.java b/qadevOOo/runner/util/FrameDsc.java index 0af97f9eedf6..147ed14a0423 100644 --- a/qadevOOo/runner/util/FrameDsc.java +++ b/qadevOOo/runner/util/FrameDsc.java @@ -34,8 +34,8 @@ public class FrameDsc extends InstDescr { private int height = 2000; private int width = 2000; private String name = null; - final String ifcName = "com.sun.star.text.XTextFrame"; - final String service = "com.sun.star.text.TextFrame"; + private final String ifcName = "com.sun.star.text.XTextFrame"; + private final String service = "com.sun.star.text.TextFrame"; public FrameDsc() { initFrame(); diff --git a/qadevOOo/runner/util/InstCreator.java b/qadevOOo/runner/util/InstCreator.java index 2f131a263fea..5259b4340558 100644 --- a/qadevOOo/runner/util/InstCreator.java +++ b/qadevOOo/runner/util/InstCreator.java @@ -33,11 +33,11 @@ import com.sun.star.container.XIndexAccess; public class InstCreator implements XInstCreator { - XInterface xParent; - XMultiServiceFactory xMSF; - XInterface xInstance; - XIndexAccess xIA; - InstDescr iDsc; + private XInterface xParent; + private XMultiServiceFactory xMSF; + private XInterface xInstance; + private XIndexAccess xIA; + private InstDescr iDsc; public InstCreator( XInterface xParent, InstDescr iDsc ) { this.xParent = xParent; diff --git a/qadevOOo/runner/util/ParagraphDsc.java b/qadevOOo/runner/util/ParagraphDsc.java index 65ec021b2d52..16508836f107 100644 --- a/qadevOOo/runner/util/ParagraphDsc.java +++ b/qadevOOo/runner/util/ParagraphDsc.java @@ -28,8 +28,8 @@ import com.sun.star.text.XTextContent; */ public class ParagraphDsc extends InstDescr { - final String service = "com.sun.star.text.Paragraph"; - String ifcName = "com.sun.star.text.XTextContent"; + private final String service = "com.sun.star.text.Paragraph"; + private String ifcName = "com.sun.star.text.XTextContent"; private String name = null; diff --git a/qadevOOo/runner/util/ReferenceMarkDsc.java b/qadevOOo/runner/util/ReferenceMarkDsc.java index 0441a89d0e1e..8185bd9ae774 100644 --- a/qadevOOo/runner/util/ReferenceMarkDsc.java +++ b/qadevOOo/runner/util/ReferenceMarkDsc.java @@ -27,8 +27,8 @@ import com.sun.star.text.XTextContent; */ public class ReferenceMarkDsc extends InstDescr { - final String service = "com.sun.star.text.ReferenceMark"; - String ifcName = "com.sun.star.text.XTextContent"; + private final String service = "com.sun.star.text.ReferenceMark"; + private String ifcName = "com.sun.star.text.XTextContent"; private String name = null; diff --git a/qadevOOo/runner/util/SOfficeFactory.java b/qadevOOo/runner/util/SOfficeFactory.java index dec23a20f8ae..f6db1c696bcd 100644 --- a/qadevOOo/runner/util/SOfficeFactory.java +++ b/qadevOOo/runner/util/SOfficeFactory.java @@ -45,7 +45,7 @@ import com.sun.star.awt.*; public class SOfficeFactory { private static HashMap<String, SOfficeFactory> lookup = new HashMap<String, SOfficeFactory>(10); - protected XComponentLoader oCLoader; + private XComponentLoader oCLoader; private SOfficeFactory(XMultiServiceFactory xMSF) { // get XInterface of Desktop service diff --git a/qadevOOo/runner/util/ShapeDsc.java b/qadevOOo/runner/util/ShapeDsc.java index faea91984842..c8f970e50701 100644 --- a/qadevOOo/runner/util/ShapeDsc.java +++ b/qadevOOo/runner/util/ShapeDsc.java @@ -32,9 +32,9 @@ public class ShapeDsc extends InstDescr { private int y = 0; private int height = 0; private int width = 0; - private String name = null; - final String ifcName = "com.sun.star.drawing.XShape"; - String service = "com.sun.star.drawing.RectangleShape"; + private String name = null; + private final String ifcName = "com.sun.star.drawing.XShape"; + private String service = "com.sun.star.drawing.RectangleShape"; public ShapeDsc( int nheight, int nwidth, int nx, int ny, String kind ) { x=nx; diff --git a/qadevOOo/runner/util/SysUtils.java b/qadevOOo/runner/util/SysUtils.java index 68166bb3e3bf..0d289f4d68da 100644 --- a/qadevOOo/runner/util/SysUtils.java +++ b/qadevOOo/runner/util/SysUtils.java @@ -41,7 +41,7 @@ public class SysUtils { return jh; } - static ArrayList<String> files = new ArrayList<String>(); + private static ArrayList<String> files = new ArrayList<String>(); public static Object[] traverse( String afileDirectory ) { diff --git a/qadevOOo/runner/util/TableDsc.java b/qadevOOo/runner/util/TableDsc.java index bfeabf615492..0821fd20ee20 100644 --- a/qadevOOo/runner/util/TableDsc.java +++ b/qadevOOo/runner/util/TableDsc.java @@ -30,8 +30,8 @@ public class TableDsc extends InstDescr { private int rows = 0; private int columns = 0; private String name = null; - final String ifcName = "com.sun.star.text.XTextTable"; - final String service = "com.sun.star.text.TextTable"; + private final String ifcName = "com.sun.star.text.XTextTable"; + private final String service = "com.sun.star.text.TextTable"; public TableDsc() { initTable(); diff --git a/qadevOOo/runner/util/TextSectionDsc.java b/qadevOOo/runner/util/TextSectionDsc.java index bb1a1b13cad7..2a435e5395ab 100644 --- a/qadevOOo/runner/util/TextSectionDsc.java +++ b/qadevOOo/runner/util/TextSectionDsc.java @@ -27,8 +27,8 @@ import com.sun.star.text.XTextContent; */ public class TextSectionDsc extends InstDescr { - final String service = "com.sun.star.text.TextSection"; - String ifcName = "com.sun.star.text.XTextContent"; + private final String service = "com.sun.star.text.TextSection"; + private String ifcName = "com.sun.star.text.XTextContent"; private String name = null; diff --git a/qadevOOo/runner/util/XLayerHandlerImpl.java b/qadevOOo/runner/util/XLayerHandlerImpl.java index 262bebd841ed..2f7dcaf50857 100644 --- a/qadevOOo/runner/util/XLayerHandlerImpl.java +++ b/qadevOOo/runner/util/XLayerHandlerImpl.java @@ -19,8 +19,8 @@ package util; public class XLayerHandlerImpl implements com.sun.star.configuration.backend.XLayerHandler { - protected String calls = ""; - protected String ls = System.getProperty("line.separator"); + private String calls = ""; + private String ls = System.getProperty("line.separator"); public void addOrReplaceNode(String str, short param) throws com.sun.star.configuration.backend.MalformedDataException, diff --git a/qadevOOo/runner/util/XLayerImpl.java b/qadevOOo/runner/util/XLayerImpl.java index 62ac73c749b2..351450292536 100644 --- a/qadevOOo/runner/util/XLayerImpl.java +++ b/qadevOOo/runner/util/XLayerImpl.java @@ -20,7 +20,7 @@ package util; public class XLayerImpl implements com.sun.star.configuration.backend.XLayer { - protected boolean wasCalled = false; + private boolean wasCalled = false; public XLayerImpl() { } diff --git a/qadevOOo/runner/util/XMLTools.java b/qadevOOo/runner/util/XMLTools.java index 7516d4b8c895..f4d7fbf0f515 100644 --- a/qadevOOo/runner/util/XMLTools.java +++ b/qadevOOo/runner/util/XMLTools.java @@ -252,13 +252,13 @@ public class XMLTools { * if the XML data and structure was valid. */ public static class XMLWellFormChecker extends XMLWriter { - protected boolean docStarted = false ; - protected boolean docEnded = false ; - protected ArrayList<String> tagStack = new ArrayList<String>() ; - protected boolean wellFormed = true ; - protected boolean noOtherErrors = true ; - protected PrintWriter log = null ; - protected boolean printXMLData = false ; + private boolean docStarted = false ; + private boolean docEnded = false ; + ArrayList<String> tagStack = new ArrayList<String>() ; + private boolean wellFormed = true ; + private boolean noOtherErrors = true ; + PrintWriter log = null ; + private boolean printXMLData = false ; private XMLWellFormChecker(PrintWriter log) { super() ; @@ -371,9 +371,9 @@ public class XMLTools { * appropriate message is output. */ public static class XMLTagsChecker extends XMLWellFormChecker { - protected HashMap<String,String> tags = new HashMap<String,String>() ; - protected HashMap<String,String> chars = new HashMap<String,String>() ; - protected boolean allOK = true ; + private HashMap<String,String> tags = new HashMap<String,String>() ; + private HashMap<String,String> chars = new HashMap<String,String>() ; + private boolean allOK = true ; public XMLTagsChecker(PrintWriter log) { super(log) ; @@ -627,11 +627,11 @@ public class XMLTools { * character data exists inside any tag specified. */ public static class XMLChecker extends XMLWellFormChecker { - protected HashSet<String> tagSet = new HashSet<String>() ; - protected ArrayList<Tag[]> tags = new ArrayList<Tag[]>() ; - protected ArrayList<Object[]> chars = new ArrayList<Object[]>() ; - protected ArrayList<String> tagStack = new ArrayList<String>() ; - protected ArrayList<AttributeList> attrStack = new ArrayList<AttributeList>() ; + private HashSet<String> tagSet = new HashSet<String>() ; + private ArrayList<Tag[]> tags = new ArrayList<Tag[]>() ; + private ArrayList<Object[]> chars = new ArrayList<Object[]>() ; + private ArrayList<String> tagStack = new ArrayList<String>() ; + private ArrayList<AttributeList> attrStack = new ArrayList<AttributeList>() ; public XMLChecker(PrintWriter log, boolean writeXML) { super(log, writeXML) ; diff --git a/qadevOOo/runner/util/XSchemaHandlerImpl.java b/qadevOOo/runner/util/XSchemaHandlerImpl.java index fb308ac921a1..06758014bbc7 100644 --- a/qadevOOo/runner/util/XSchemaHandlerImpl.java +++ b/qadevOOo/runner/util/XSchemaHandlerImpl.java @@ -19,8 +19,8 @@ package util; public class XSchemaHandlerImpl implements com.sun.star.configuration.backend.XSchemaHandler { - protected String calls = ""; - protected String ls = System.getProperty("line.separator"); + private String calls = ""; + private String ls = System.getProperty("line.separator"); public void addInstance(String str, com.sun.star.configuration.backend.TemplateIdentifier templateIdentifier) diff --git a/qadevOOo/runner/util/compare/GraphicalComparator.java b/qadevOOo/runner/util/compare/GraphicalComparator.java index 420f0249c16f..47b99b8aa218 100644 --- a/qadevOOo/runner/util/compare/GraphicalComparator.java +++ b/qadevOOo/runner/util/compare/GraphicalComparator.java @@ -33,7 +33,7 @@ import convwatch.ConvWatchException; class GraphicalComparator implements DocComparator { - GraphicalTestArguments m_aArguments; + private GraphicalTestArguments m_aArguments; protected GraphicalComparator(TestParameters aParams) { |