[Libreoffice-commits] core.git: bean/qa bridges/test comphelper/qa connectivity/qa dbaccess/qa desktop/test forms/qa framework/qa javaunohelper/test jurt/test nlpsolver/src qadevOOo/runner qadevOOo/testdocs qadevOOo/tests reportbuilder/java sc/qa scripting/java sot/qa svl/qa sw/qa testtools/com testtools/qa toolkit/test unotest/source unotools/qa unoxml/qa vcl/qa wizards/com xmerge/source
Noel Grandin
noel at peralex.com
Wed Dec 10 22:09:38 PST 2014
bean/qa/complex/bean/OOoBeanTest.java | 4
bean/qa/complex/bean/WriterFrame.java | 2
bridges/test/java_uno/any/TestAny.java | 20 +-
comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java | 2
connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java | 46 ++---
connectivity/qa/connectivity/tools/CRMDatabase.java | 2
connectivity/qa/connectivity/tools/DataSource.java | 2
dbaccess/qa/complex/dbaccess/TestCase.java | 6
desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java | 4
forms/qa/integration/forms/TestCase.java | 2
framework/qa/complex/XUserInputInterception/EventTest.java | 4
framework/qa/complex/framework/recovery/RecoveryTools.java | 2
javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java | 4
jurt/test/com/sun/star/lib/uno/environments/remote/TestWorkAt.java | 6
jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java | 2
jurt/test/com/sun/star/lib/uno/protocols/urp/TestBridge.java | 8 -
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/BaseDialog.java | 4
qadevOOo/runner/complexlib/Assurance.java | 2
qadevOOo/runner/convwatch/GraphicalTestArguments.java | 6
qadevOOo/runner/convwatch/MSOfficePrint.java | 2
qadevOOo/runner/convwatch/PerformanceContainer.java | 2
qadevOOo/runner/graphical/MSOfficePostscriptCreator.java | 2
qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java | 2
qadevOOo/runner/graphical/PerformanceContainer.java | 2
qadevOOo/runner/helper/ComplexDescGetter.java | 2
qadevOOo/runner/helper/ProcessHandler.java | 4
qadevOOo/runner/lib/MultiMethodTest.java | 10 -
qadevOOo/runner/lib/TestParameters.java | 2
qadevOOo/runner/lib/TestResult.java | 2
qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java | 2
qadevOOo/testdocs/qadevlibs/source/test/Job.java | 6
qadevOOo/tests/java/mod/_dbaccess/ORowSet.java | 2
qadevOOo/tests/java/mod/_forms/GenericModelTest.java | 10 -
qadevOOo/tests/java/mod/_forms/ODatabaseForm.java | 8 -
qadevOOo/tests/java/mod/_forms/OListBoxModel.java | 10 -
qadevOOo/tests/java/mod/_forms/OTimeModel.java | 10 -
qadevOOo/tests/java/mod/_fwk/JobExecutor.java | 4
qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java | 4
qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java | 4
qadevOOo/tests/java/mod/_remotebridge/uno/various.java | 12 -
qadevOOo/tests/java/mod/_remotebridge/various.java | 12 -
qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java | 8 -
qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java | 4
qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java | 4
qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java | 4
qadevOOo/tests/java/mod/_sc/XMLContentExporter.java | 4
qadevOOo/tests/java/mod/_sc/XMLExporter.java | 4
qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java | 4
qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java | 4
qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java | 4
qadevOOo/tests/java/mod/_sm/XMLExporter.java | 4
qadevOOo/tests/java/mod/_sm/XMLMetaExporter.java | 4
qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java | 4
qadevOOo/tests/java/mod/_sw/XMLContentExporter.java | 4
qadevOOo/tests/java/mod/_sw/XMLExporter.java | 4
qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java | 4
qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java | 4
qadevOOo/tests/java/mod/_sw/XMLStylesExporter.java | 4
qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java | 8 -
qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java | 8 -
qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java | 8 -
qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java | 2
qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java | 4
qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java | 4
qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java | 4
qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java | 4
qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java | 4
qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java | 4
qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java | 4
qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java | 4
qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java | 4
qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java | 4
qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java | 4
qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java | 4
qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java | 4
reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java | 6
reportbuilder/java/org/libreoffice/report/pentaho/output/text/PageContext.java | 4
sc/qa/complex/dataPilot/_XPropertySet.java | 8 -
scripting/java/com/sun/star/script/framework/container/ScriptEntry.java | 4
scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java | 4
sot/qa/complex/olesimplestorage/Test01.java | 8 -
sot/qa/complex/olesimplestorage/TestHelper.java | 2
svl/qa/complex/passwordcontainer/Test01.java | 4
svl/qa/complex/passwordcontainer/Test02.java | 4
svl/qa/complex/passwordcontainer/Test03.java | 4
svl/qa/complex/passwordcontainer/TestHelper.java | 4
sw/qa/complex/writer/LoadSaveTest.java | 6
sw/qa/complex/writer/TextPortionEnumerationTest.java | 2
testtools/com/sun/star/comp/bridge/TestComponentMain.java | 4
testtools/qa/cli/CLITest.java | 2
testtools/qa/cliversioning/VersionTestCase.java | 2
toolkit/test/accessibility/AccTreeNode.java | 10 -
toolkit/test/accessibility/AccessibilityTree.java | 26 +--
toolkit/test/accessibility/AccessibilityTreeModel.java | 28 +--
toolkit/test/accessibility/AccessibilityWorkBench.java | 20 +-
toolkit/test/accessibility/AccessibleActionHandler.java | 2
toolkit/test/accessibility/AccessibleCellHandler.java | 2
toolkit/test/accessibility/AccessibleComponentHandler.java | 2
toolkit/test/accessibility/AccessibleContextHandler.java | 2
toolkit/test/accessibility/AccessibleEditableTextHandler.java | 2
toolkit/test/accessibility/AccessibleExtendedComponentHandler.java | 2
toolkit/test/accessibility/AccessibleHyperlinkHandler.java | 2
toolkit/test/accessibility/AccessibleHypertextHandler.java | 2
toolkit/test/accessibility/AccessibleImageHandler.java | 4
toolkit/test/accessibility/AccessibleRelationHandler.java | 2
toolkit/test/accessibility/AccessibleSelectionHandler.java | 2
toolkit/test/accessibility/AccessibleTableHandler.java | 2
toolkit/test/accessibility/AccessibleTextHandler.java | 28 +--
toolkit/test/accessibility/AccessibleTreeCellRenderer.java | 6
toolkit/test/accessibility/AccessibleTreeHandler.java | 4
toolkit/test/accessibility/AccessibleTreeNode.java | 2
toolkit/test/accessibility/Canvas.java | 8 -
toolkit/test/accessibility/CanvasShape.java | 6
toolkit/test/accessibility/EventListener.java | 2
toolkit/test/accessibility/EventQueue.java | 4
toolkit/test/accessibility/HelpWindow.java | 2
toolkit/test/accessibility/InformationWriter.java | 6
toolkit/test/accessibility/MessageArea.java | 4
toolkit/test/accessibility/SelectionDialog.java | 12 -
toolkit/test/accessibility/SimpleOffice.java | 12 -
toolkit/test/accessibility/ov/ContextView.java | 2
toolkit/test/accessibility/ov/FocusView.java | 2
toolkit/test/accessibility/ov/ObjectViewContainer.java | 2
toolkit/test/accessibility/ov/StateSetView.java | 10 -
toolkit/test/accessibility/ov/TextView.java | 2
unotest/source/java/org/openoffice/test/tools/OfficeDocument.java | 8 -
unotest/source/java/org/openoffice/test/tools/OfficeDocumentView.java | 4
unotest/source/java/org/openoffice/test/tools/SpreadsheetDocument.java | 2
unotools/qa/complex/tempfile/Test01.java | 6
unotools/qa/complex/tempfile/Test02.java | 6
unotools/qa/complex/tempfile/TestHelper.java | 2
unoxml/qa/complex/unoxml/DOMTest.java | 6
unoxml/qa/complex/unoxml/RDFRepositoryTest.java | 10 -
vcl/qa/complex/memCheck/TestDocument.java | 2
wizards/com/sun/star/wizards/common/Configuration.java | 4
wizards/com/sun/star/wizards/common/Desktop.java | 16 +-
wizards/com/sun/star/wizards/common/FileAccess.java | 10 -
wizards/com/sun/star/wizards/common/Helper.java | 2
wizards/com/sun/star/wizards/common/JavaTools.java | 2
wizards/com/sun/star/wizards/common/NumberFormatter.java | 24 +--
wizards/com/sun/star/wizards/common/NumericalHelper.java | 24 +--
wizards/com/sun/star/wizards/common/ParaStyled.java | 2
wizards/com/sun/star/wizards/common/PlaceholderTextElement.java | 6
wizards/com/sun/star/wizards/common/Properties.java | 4
wizards/com/sun/star/wizards/common/PropertySetHelper.java | 4
wizards/com/sun/star/wizards/common/Resource.java | 8 -
wizards/com/sun/star/wizards/common/TextElement.java | 2
wizards/com/sun/star/wizards/db/BlindtextCreator.java | 2
wizards/com/sun/star/wizards/db/ColumnPropertySet.java | 2
wizards/com/sun/star/wizards/db/CommandMetaData.java | 8 -
wizards/com/sun/star/wizards/db/CommandName.java | 24 +--
wizards/com/sun/star/wizards/db/DBMetaData.java | 18 +-
wizards/com/sun/star/wizards/db/FieldColumn.java | 2
wizards/com/sun/star/wizards/db/QueryMetaData.java | 2
wizards/com/sun/star/wizards/db/RecordParser.java | 14 -
wizards/com/sun/star/wizards/db/SQLQueryComposer.java | 28 +--
wizards/com/sun/star/wizards/db/TableDescriptor.java | 24 +--
wizards/com/sun/star/wizards/db/TypeInspector.java | 6
wizards/com/sun/star/wizards/document/Control.java | 22 +-
wizards/com/sun/star/wizards/document/DatabaseControl.java | 4
wizards/com/sun/star/wizards/document/FormHandler.java | 36 ++--
wizards/com/sun/star/wizards/document/GridControl.java | 4
wizards/com/sun/star/wizards/document/OfficeDocument.java | 4
wizards/com/sun/star/wizards/document/Shape.java | 4
wizards/com/sun/star/wizards/document/TimeStampControl.java | 16 +-
wizards/com/sun/star/wizards/form/FieldLinker.java | 2
wizards/com/sun/star/wizards/form/Finalizer.java | 10 -
wizards/com/sun/star/wizards/form/FormConfiguration.java | 24 +--
wizards/com/sun/star/wizards/form/FormControlArranger.java | 2
wizards/com/sun/star/wizards/form/FormDocument.java | 24 +--
wizards/com/sun/star/wizards/form/FormWizard.java | 10 -
wizards/com/sun/star/wizards/form/StyleApplier.java | 2
wizards/com/sun/star/wizards/query/QuerySummary.java | 14 -
wizards/com/sun/star/wizards/query/QueryWizard.java | 10 -
wizards/com/sun/star/wizards/report/DBColumn.java | 28 +--
wizards/com/sun/star/wizards/report/Dataimport.java | 12 -
wizards/com/sun/star/wizards/report/GroupFieldHandler.java | 4
wizards/com/sun/star/wizards/report/ReportFinalizer.java | 12 -
wizards/com/sun/star/wizards/report/ReportLayouter.java | 20 +-
wizards/com/sun/star/wizards/report/ReportTextDocument.java | 22 +-
wizards/com/sun/star/wizards/report/ReportTextImplementation.java | 12 -
wizards/com/sun/star/wizards/report/ReportWizard.java | 14 -
wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java | 80 +++++-----
wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java | 2
wizards/com/sun/star/wizards/reportbuilder/layout/SectionObject.java | 2
wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField.java | 2
wizards/com/sun/star/wizards/table/CGCategory.java | 6
wizards/com/sun/star/wizards/table/CGTable.java | 4
wizards/com/sun/star/wizards/table/FieldDescription.java | 2
wizards/com/sun/star/wizards/table/FieldFormatter.java | 26 +--
wizards/com/sun/star/wizards/table/Finalizer.java | 20 +-
wizards/com/sun/star/wizards/table/ScenarioSelector.java | 10 -
wizards/com/sun/star/wizards/table/TableWizard.java | 22 +-
wizards/com/sun/star/wizards/text/TextDocument.java | 6
wizards/com/sun/star/wizards/text/TextFieldHandler.java | 6
wizards/com/sun/star/wizards/text/TextSectionHandler.java | 6
wizards/com/sun/star/wizards/text/TextTableHandler.java | 4
wizards/com/sun/star/wizards/ui/AggregateComponent.java | 46 ++---
wizards/com/sun/star/wizards/ui/ButtonList.java | 12 -
wizards/com/sun/star/wizards/ui/CommandFieldSelection.java | 12 -
wizards/com/sun/star/wizards/ui/ControlScroller.java | 38 ++--
wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java | 6
wizards/com/sun/star/wizards/ui/FieldSelection.java | 10 -
wizards/com/sun/star/wizards/ui/FilterComponent.java | 74 ++++-----
wizards/com/sun/star/wizards/ui/PeerConfig.java | 14 -
wizards/com/sun/star/wizards/ui/SortingComponent.java | 30 +--
wizards/com/sun/star/wizards/ui/TitlesComponent.java | 16 +-
wizards/com/sun/star/wizards/ui/UnoDialog.java | 24 +--
wizards/com/sun/star/wizards/ui/UnoDialog2.java | 6
wizards/com/sun/star/wizards/ui/WizardDialog.java | 22 +-
wizards/com/sun/star/wizards/ui/event/DataAware.java | 14 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java | 8 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java | 10 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/util/TwipsConverter.java | 4
219 files changed, 917 insertions(+), 917 deletions(-)
New commits:
commit 7557f23b31dcfb4d86c122bb34d9675c0db9a694
Author: Noel Grandin <noel at peralex.com>
Date: Wed Dec 10 15:36:24 2014 +0200
java: reduce visibility of fields and methods
found by PMD
Change-Id: Id6737916b68ccbdbdeec5d314747a38410923ac6
Reviewed-on: https://gerrit.libreoffice.org/13409
Tested-by: LibreOffice gerrit bot <gerrit at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/bean/qa/complex/bean/OOoBeanTest.java b/bean/qa/complex/bean/OOoBeanTest.java
index 141f63d..22c5fb4 100644
--- a/bean/qa/complex/bean/OOoBeanTest.java
+++ b/bean/qa/complex/bean/OOoBeanTest.java
@@ -651,9 +651,9 @@ public class OOoBeanTest
}
}
- class BeanPanel extends Panel
+ private class BeanPanel extends Panel
{
- public BeanPanel(OOoBean b)
+ private BeanPanel(OOoBean b)
{
setLayout(new BorderLayout());
add(b, BorderLayout.CENTER);
diff --git a/bean/qa/complex/bean/WriterFrame.java b/bean/qa/complex/bean/WriterFrame.java
index 9c0eb7d..77f1959 100644
--- a/bean/qa/complex/bean/WriterFrame.java
+++ b/bean/qa/complex/bean/WriterFrame.java
@@ -146,7 +146,7 @@ class WriterFrame extends java.awt.Frame
return rc;
}
- public Rectangle getUnoFramePosition() throws Exception
+ private Rectangle getUnoFramePosition() throws Exception
{
com.sun.star.awt.XWindow win = m_bean.getFrame().getContainerWindow();
com.sun.star.awt.Rectangle rect = win.getPosSize();
diff --git a/bridges/test/java_uno/any/TestAny.java b/bridges/test/java_uno/any/TestAny.java
index 1e7cf2e..752f2c3 100644
--- a/bridges/test/java_uno/any/TestAny.java
+++ b/bridges/test/java_uno/any/TestAny.java
@@ -2177,7 +2177,7 @@ final class TestAny {
private final Class clazz;
}
- public static class Enum1 extends Enum {
+ private static class Enum1 extends Enum {
public Enum1() {
super(0);
}
@@ -2192,31 +2192,31 @@ final class TestAny {
}
}
- public static class Enum2 extends Enum1 {
+ private static class Enum2 extends Enum1 {
@Override
public boolean equals(Object obj) {
return obj != null && obj.getClass() == Enum2.class;
}
}
- public static class BaseStruct {
+ private static class BaseStruct {
@Override
public boolean equals(Object obj) {
return obj != null && obj.getClass() == BaseStruct.class;
}
}
- public static class DerivedStruct extends BaseStruct {
+ private static class DerivedStruct extends BaseStruct {
@Override
public boolean equals(Object obj) {
return obj != null && obj.getClass() == DerivedStruct.class;
}
}
- public static class BaseException extends com.sun.star.uno.Exception {
+ private static class BaseException extends com.sun.star.uno.Exception {
public BaseException() {}
- public BaseException(String message) {
+ private BaseException(String message) {
super(message);
}
@@ -2226,7 +2226,7 @@ final class TestAny {
}
}
- public static class DerivedException extends BaseException {
+ private static class DerivedException extends BaseException {
public DerivedException() {}
public DerivedException(String message) {
@@ -2239,12 +2239,12 @@ final class TestAny {
}
}
- public static class BaseRuntimeException
+ private static class BaseRuntimeException
extends com.sun.star.uno.RuntimeException
{
public BaseRuntimeException() {}
- public BaseRuntimeException(String message) {
+ private BaseRuntimeException(String message) {
super(message);
}
@@ -2255,7 +2255,7 @@ final class TestAny {
}
}
- public static class DerivedRuntimeException extends BaseRuntimeException
+ private static class DerivedRuntimeException extends BaseRuntimeException
{
public DerivedRuntimeException() {}
diff --git a/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java b/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java
index 40c2714..9167b09 100644
--- a/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java
+++ b/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.*;
class TestHelper
{
- String m_sTestPrefix;
+ private String m_sTestPrefix;
/** Creates a new instance of TestHelper
*/
diff --git a/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
index ecca4fd..66c65e1 100644
--- a/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
+++ b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
@@ -68,54 +68,54 @@ import com.sun.star.sdbc.*;
public class TestCacheSize {
// program can edit the *.properties file to set cache_size
- protected boolean filedb = true;
+ private boolean filedb = true;
// shutdown performed mid operation - not for mem: or hsql: URL's
- protected boolean shutdown = true;
+ private boolean shutdown = true;
// fixed
- protected String url = "sdbc:embedded:hsqldb";
+ private String url = "sdbc:embedded:hsqldb";
// frequent reporting of progress
- boolean reportProgress = false;
+ private boolean reportProgress = false;
- XMultiServiceFactory servicefactory = null;
+ private XMultiServiceFactory servicefactory = null;
// type of the big table {MEMORY | CACHED | TEXT}
- String tableType = "CACHED";
- int cacheScale = 17;
+ private String tableType = "CACHED";
+ private int cacheScale = 17;
int cacheSizeScale = 8;
// script format {TEXT, BINARY, COMPRESSED}
- String logType = "TEXT";
- int writeDelay = 60;
- boolean indexZip = true;
- boolean indexLastName = false;
- boolean addForeignKey = false;
- boolean refIntegrity = true;
+ private String logType = "TEXT";
+ private int writeDelay = 60;
+ private boolean indexZip = true;
+ private boolean indexLastName = false;
+ private boolean addForeignKey = false;
+ private boolean refIntegrity = true;
// speeds up inserts when tableType=="CACHED"
- boolean createTempTable = false;
+ private boolean createTempTable = false;
// introduces fragmentation to the .data file during insert
- boolean deleteWhileInsert = false;
- int deleteWhileInsertInterval = 10000;
+ private boolean deleteWhileInsert = false;
+ private int deleteWhileInsertInterval = 10000;
// size of the tables used in test
int bigrows = 10000;
int smallrows = 0xfff;
// if the extra table needs to be created and filled up
- boolean multikeytable = false;
+ private boolean multikeytable = false;
- String user;
- String password;
- XStatement sStatement;
- XConnection cConnection;
+ private String user;
+ private String password;
+ private XStatement sStatement;
+ private XConnection cConnection;
XDataSource ds;
- XDriver drv;
- com.sun.star.beans.PropertyValue[] info;
+ private XDriver drv;
+ private com.sun.star.beans.PropertyValue[] info;
public TestCacheSize(XMultiServiceFactory _xmulti,com.sun.star.beans.PropertyValue[] _info,XDriver _drv){
servicefactory = _xmulti;
diff --git a/connectivity/qa/connectivity/tools/CRMDatabase.java b/connectivity/qa/connectivity/tools/CRMDatabase.java
index 3caf024..3d33926 100644
--- a/connectivity/qa/connectivity/tools/CRMDatabase.java
+++ b/connectivity/qa/connectivity/tools/CRMDatabase.java
@@ -112,7 +112,7 @@ public class CRMDatabase
}
- public XDatabaseDocumentUI getDocumentUI()
+ private XDatabaseDocumentUI getDocumentUI()
{
XModel docModel = UnoRuntime.queryInterface( XModel.class, m_database.getDatabaseDocument() );
return UnoRuntime.queryInterface( XDatabaseDocumentUI.class, docModel.getCurrentController() );
diff --git a/connectivity/qa/connectivity/tools/DataSource.java b/connectivity/qa/connectivity/tools/DataSource.java
index 748ee61..5b42e34 100644
--- a/connectivity/qa/connectivity/tools/DataSource.java
+++ b/connectivity/qa/connectivity/tools/DataSource.java
@@ -109,7 +109,7 @@ public class DataSource
/** provides the container of query definitions of the data source
*/
- public XNameAccess getQueryDefinitions()
+ private XNameAccess getQueryDefinitions()
{
final XQueryDefinitionsSupplier suppQueries = UnoRuntime.queryInterface(
XQueryDefinitionsSupplier.class, m_dataSource);
diff --git a/dbaccess/qa/complex/dbaccess/TestCase.java b/dbaccess/qa/complex/dbaccess/TestCase.java
index 4a9fa8a..a9768e7 100644
--- a/dbaccess/qa/complex/dbaccess/TestCase.java
+++ b/dbaccess/qa/complex/dbaccess/TestCase.java
@@ -116,7 +116,7 @@ public abstract class TestCase
* 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();
@@ -152,7 +152,7 @@ public abstract class TestCase
* @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 ];
@@ -169,7 +169,7 @@ public abstract class TestCase
* @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 Object _object, final String _methodName, final Object[] _methodArgs,
+ private void assureException( final Object _object, final String _methodName, final Object[] _methodArgs,
final Class _expectedExceptionClass )
{
assureException(
diff --git a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
index 7cd3688..abd49d5 100644
--- a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
+++ b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
@@ -43,7 +43,7 @@ import com.sun.star.util.XChangesBatch;
*/
public class OptionsEventHandler {
- public static class _OptionsEventHandler extends WeakBase
+ private static class _OptionsEventHandler extends WeakBase
implements XServiceInfo, XContainerWindowEventHandler {
static private final String __serviceName =
@@ -106,7 +106,7 @@ public class OptionsEventHandler {
* static component initialisation functions as well as in
* getSupportedServiceNames.
*/
- public static String[] getServiceNames() {
+ private static String[] getServiceNames() {
String[] sSupportedServiceNames = { __serviceName };
return sSupportedServiceNames;
}
diff --git a/forms/qa/integration/forms/TestCase.java b/forms/qa/integration/forms/TestCase.java
index c2c18d2..cc1e6ec 100644
--- a/forms/qa/integration/forms/TestCase.java
+++ b/forms/qa/integration/forms/TestCase.java
@@ -25,7 +25,7 @@ import com.sun.star.util.XModifiable;
public abstract class TestCase extends complexlib.ComplexTestCase implements com.sun.star.lang.XEventListener
{
protected XMultiServiceFactory m_orb; /// our service factory
- protected DocumentType m_documentType; /// the type of our document
+ private DocumentType m_documentType; /// the type of our document
protected DocumentHelper m_document; /// our current test document
protected FormLayer m_formLayer;
diff --git a/framework/qa/complex/XUserInputInterception/EventTest.java b/framework/qa/complex/XUserInputInterception/EventTest.java
index 2479b32..9737bbe 100644
--- a/framework/qa/complex/XUserInputInterception/EventTest.java
+++ b/framework/qa/complex/XUserInputInterception/EventTest.java
@@ -327,7 +327,7 @@ public class EventTest {
* Listener which added and its method must be called
* on <code>keyPressed</code> and <code>keyReleased</code> call.
*/
- public class MyKeyHandler implements XKeyHandler {
+ private class MyKeyHandler implements XKeyHandler {
/**
* This event sets the member <code>m_keyPressed</coed> to
* <code>true</code>
@@ -363,7 +363,7 @@ public class EventTest {
* Listener which added and its method must be called
* on <code>mousePressed</code> and <code>mouseReleased</code> call.
*/
- public class MyMouseClickHandler implements XMouseClickHandler {
+ private class MyMouseClickHandler implements XMouseClickHandler {
/**
* This event sets the member <code>m_mousePressed</coed> to
* <code>true</code>
diff --git a/framework/qa/complex/framework/recovery/RecoveryTools.java b/framework/qa/complex/framework/recovery/RecoveryTools.java
index b476ab0..e918055 100644
--- a/framework/qa/complex/framework/recovery/RecoveryTools.java
+++ b/framework/qa/complex/framework/recovery/RecoveryTools.java
@@ -162,7 +162,7 @@ public class RecoveryTools {
}
}
- public HashMap<String, String> getRecoveryFiles()
+ private HashMap<String, String> getRecoveryFiles()
throws com.sun.star.io.IOException
{
try{
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java b/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java
index 9a67b20..28a2779 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java
@@ -27,7 +27,7 @@ import com.sun.star.lib.uno.environments.java.java_environment;
public class ProxyProvider
{
- static java_environment env= new java_environment(null);
+ private static java_environment env= new java_environment(null);
/** returns Holder proxy objects for the specified interface. If the method is called
* several times with the same arguments then each time a new HolderProxy is returned.
@@ -61,7 +61,7 @@ public class ProxyProvider
class Proxy implements IQueryInterface, XEventListener
{
- String oid;
+ private String oid;
Type type;
Proxy(String oid, Type t) {
this.oid = oid;
diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/TestWorkAt.java b/jurt/test/com/sun/star/lib/uno/environments/remote/TestWorkAt.java
index f907a3c..638427f 100644
--- a/jurt/test/com/sun/star/lib/uno/environments/remote/TestWorkAt.java
+++ b/jurt/test/com/sun/star/lib/uno/environments/remote/TestWorkAt.java
@@ -34,10 +34,10 @@ class TestWorkAt implements TestIWorkAt {
int _sync_counter;
int _async_counter;
- Thread _sync_thread;
- Thread _async_thread;
+ private Thread _sync_thread;
+ private Thread _async_thread;
- boolean _passedAync = true;
+ private boolean _passedAync = true;
boolean _notified = false;
public synchronized void syncCall() throws Throwable {
diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java b/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java
index aff5def..e3ac682 100644
--- a/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java
+++ b/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java
@@ -232,7 +232,7 @@ public class ThreadPool_Test {
}
abstract class Stress extends Thread {
- public Stress(int count) {
+ private Stress(int count) {
this.count = count;
}
diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/TestBridge.java b/jurt/test/com/sun/star/lib/uno/protocols/urp/TestBridge.java
index 88f6aee..e84bd2a 100644
--- a/jurt/test/com/sun/star/lib/uno/protocols/urp/TestBridge.java
+++ b/jurt/test/com/sun/star/lib/uno/protocols/urp/TestBridge.java
@@ -28,14 +28,14 @@ import com.sun.star.uno.Type;
class TestBridge implements IBridge {
- static public final boolean DEBUG = false;
+ static private final boolean DEBUG = false;
- final HashMap<String,Object> _hashtable = new HashMap<String,Object>();
+ private final HashMap<String,Object> _hashtable = new HashMap<String,Object>();
- IEnvironment _source ;//= new com.sun.star.lib.uno.environments.java.java_environment(null);
+ private IEnvironment _source ;//= new com.sun.star.lib.uno.environments.java.java_environment(null);
- class MyEnv implements IEnvironment {
+ private class MyEnv implements IEnvironment {
public Object getContext() {
return null;
}
diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/BaseDialog.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/BaseDialog.java
index 84db968..36fdd4d 100644
--- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/BaseDialog.java
+++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/BaseDialog.java
@@ -71,7 +71,7 @@ public abstract class BaseDialog extends BaseControl {
return xMSF;
}
- public XFrame getCurrentFrame() {
+ private XFrame getCurrentFrame() {
try {
Object oDesktop = xMCF.createInstanceWithContext("com.sun.star.frame.Desktop", context);
XDesktop xDesktop = UnoRuntime.queryInterface(XDesktop.class, oDesktop);
@@ -84,7 +84,7 @@ public abstract class BaseDialog extends BaseControl {
}
}
- public Rectangle getWorkspaceDimensions() {
+ private Rectangle getWorkspaceDimensions() {
return getCurrentFrame().getComponentWindow().getPosSize();
}
diff --git a/qadevOOo/runner/complexlib/Assurance.java b/qadevOOo/runner/complexlib/Assurance.java
index 53d287e..0cbc1e0 100644
--- a/qadevOOo/runner/complexlib/Assurance.java
+++ b/qadevOOo/runner/complexlib/Assurance.java
@@ -170,7 +170,7 @@ public class Assurance
public class AssureException extends RuntimeException {
- public AssureException(String msg) {
+ private AssureException(String msg) {
super(msg);
}
public AssureException(Throwable cause) {
diff --git a/qadevOOo/runner/convwatch/GraphicalTestArguments.java b/qadevOOo/runner/convwatch/GraphicalTestArguments.java
index 2d35b96..669083b 100644
--- a/qadevOOo/runner/convwatch/GraphicalTestArguments.java
+++ b/qadevOOo/runner/convwatch/GraphicalTestArguments.java
@@ -329,7 +329,7 @@ public class GraphicalTestArguments
}
// set methods
- public void setReferenceType(String _sType)
+ private void setReferenceType(String _sType)
{
// special casse, null is not allowed, set to default.
if (_sType == null)
@@ -342,10 +342,10 @@ public class GraphicalTestArguments
}
}
public void setTargetFrameName(String _sTargetFrameName) {m_sTargetFrameName = _sTargetFrameName;}
- public void setPrinterName(String _sName) {m_sPrinterName = _sName;}
+ private void setPrinterName(String _sName) {m_sPrinterName = _sName;}
private void setHidden() { m_bHidden = true;}
private void setViewable() {m_bHidden = false;}
- public void setDefaultXMLFormatApp(String _sNameOfApp) {m_sDefaultXMLFormatApplication = _sNameOfApp;}
+ private void setDefaultXMLFormatApp(String _sNameOfApp) {m_sDefaultXMLFormatApplication = _sNameOfApp;}
// get methods
public XMultiServiceFactory getMultiServiceFactory()
diff --git a/qadevOOo/runner/convwatch/MSOfficePrint.java b/qadevOOo/runner/convwatch/MSOfficePrint.java
index 9ed3b4b..e6235be 100644
--- a/qadevOOo/runner/convwatch/MSOfficePrint.java
+++ b/qadevOOo/runner/convwatch/MSOfficePrint.java
@@ -42,7 +42,7 @@ public class MSOfficePrint
{
private String m_sPrinterName; // within Windows the tools need a printer name;
- public void setPrinterName(String _s) {m_sPrinterName = _s;}
+ private void setPrinterName(String _s) {m_sPrinterName = _s;}
private static boolean isWordDocument(String _sSuffix)
diff --git a/qadevOOo/runner/convwatch/PerformanceContainer.java b/qadevOOo/runner/convwatch/PerformanceContainer.java
index 0590ef3..2f32bde 100644
--- a/qadevOOo/runner/convwatch/PerformanceContainer.java
+++ b/qadevOOo/runner/convwatch/PerformanceContainer.java
@@ -26,7 +26,7 @@ public class PerformanceContainer {
/*
simple helper functions to start/stop a timer, to know how long a process need in milliseconds
*/
- public long getStartTime()
+ private long getStartTime()
{
return System.currentTimeMillis();
}
diff --git a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java
index ba9a7ba..a909651 100644
--- a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java
+++ b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java
@@ -36,7 +36,7 @@ public class MSOfficePostscriptCreator implements IOffice
{
private String m_sPrinterName; // within Windows the tools need a printer name;
- public void setPrinterName(String _s)
+ private void setPrinterName(String _s)
{
m_sPrinterName = _s;
}
diff --git a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
index dfbdfd8..efba9a8 100644
--- a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
+++ b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
@@ -622,7 +622,7 @@ public class OpenOfficePostscriptCreator implements IOffice
- public boolean isStoreAllowed()
+ private boolean isStoreAllowed()
{
return false;
}
diff --git a/qadevOOo/runner/graphical/PerformanceContainer.java b/qadevOOo/runner/graphical/PerformanceContainer.java
index 5812f59..0ebda69 100644
--- a/qadevOOo/runner/graphical/PerformanceContainer.java
+++ b/qadevOOo/runner/graphical/PerformanceContainer.java
@@ -27,7 +27,7 @@ public class PerformanceContainer {
/*
simple helper functions to start/stop a timer, to know how long a process need in milliseconds
*/
- public long getStartTime()
+ private long getStartTime()
{
return System.currentTimeMillis();
}
diff --git a/qadevOOo/runner/helper/ComplexDescGetter.java b/qadevOOo/runner/helper/ComplexDescGetter.java
index 1c2099c..e92cce0 100644
--- a/qadevOOo/runner/helper/ComplexDescGetter.java
+++ b/qadevOOo/runner/helper/ComplexDescGetter.java
@@ -33,7 +33,7 @@ import complexlib.ComplexTestCase;
public class ComplexDescGetter extends DescGetter
{
- ComplexTest testClass;
+ private ComplexTest testClass;
/** Creates new ComplexDescGetter */
public ComplexDescGetter()
diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java
index 332eb52..9e0b352 100644
--- a/qadevOOo/runner/helper/ProcessHandler.java
+++ b/qadevOOo/runner/helper/ProcessHandler.java
@@ -729,7 +729,7 @@ public class ProcessHandler
* @return <code>true</code> if the external command was
* found and successfully started.
*/
- public boolean isStarted()
+ private boolean isStarted()
{
return isStarted;
}
@@ -741,7 +741,7 @@ public class ProcessHandler
* @return <code>true</code> if the command correctly starts,
* exits and was not interrupted due to timeout.
*/
- public boolean isFinished()
+ private boolean isFinished()
{
return isFinished;
}
diff --git a/qadevOOo/runner/lib/MultiMethodTest.java b/qadevOOo/runner/lib/MultiMethodTest.java
index c1f0b30..aabd919 100644
--- a/qadevOOo/runner/lib/MultiMethodTest.java
+++ b/qadevOOo/runner/lib/MultiMethodTest.java
@@ -290,7 +290,7 @@ public class MultiMethodTest
* @param methName the method name to set status
* @param methStatus the status to set to the method
*/
- protected void setStatus(String methName, Status methStatus)
+ private void setStatus(String methName, Status methStatus)
{
tRes.tested(methName, methStatus);
}
@@ -298,7 +298,7 @@ public class MultiMethodTest
/**
* sets the substates
*/
- protected void setSubStates(String msg)
+ private void setSubStates(String msg)
{
for (int k = 0; k < entry.SubEntryCount; k++)
{
@@ -332,7 +332,7 @@ public class MultiMethodTest
/**
* Checks if the <code>method</code> test has been already called.
*/
- protected boolean isCalled(String method)
+ private boolean isCalled(String method)
{
return methCalled.contains(method);
}
@@ -373,7 +373,7 @@ public class MultiMethodTest
/**
* Just calls the <code>method</code> test.
*/
- protected void callMethod(String method)
+ private void callMethod(String method)
{
methCalled.add(method);
invokeTestMethod(getMethodFor(method), method);
@@ -440,7 +440,7 @@ public class MultiMethodTest
*
* @return the testing method, if found, <tt>null</tt> otherwise
*/
- protected Method getMethodFor(String method)
+ private Method getMethodFor(String method)
{
String mName = "_" + method;
diff --git a/qadevOOo/runner/lib/TestParameters.java b/qadevOOo/runner/lib/TestParameters.java
index 1ca6a5c..57501c1 100644
--- a/qadevOOo/runner/lib/TestParameters.java
+++ b/qadevOOo/runner/lib/TestParameters.java
@@ -199,7 +199,7 @@ public class TestParameters extends HashMap<String,Object> {
* to OOo rules.
* @return A valid OS name, or "" if the name is not known.
*/
- String getSOCompatibleOSName() {
+ private String getSOCompatibleOSName() {
String osname = System.getProperty ("os.name").toLowerCase ();
String osarch = System.getProperty ("os.arch");
String operatingSystem = "";
diff --git a/qadevOOo/runner/lib/TestResult.java b/qadevOOo/runner/lib/TestResult.java
index a6c964f..eb7a469 100644
--- a/qadevOOo/runner/lib/TestResult.java
+++ b/qadevOOo/runner/lib/TestResult.java
@@ -27,7 +27,7 @@ public class TestResult {
/**
* Contains methods having been tested and their results.
*/
- protected HashMap<String, Status> testedMethods = new HashMap<String, Status>();
+ private HashMap<String, Status> testedMethods = new HashMap<String, Status>();
/**
* The method makes method tested with the result, i.e. it adds to its
diff --git a/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java b/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java
index 91aa808..ab739aeb 100644
--- a/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java
+++ b/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java
@@ -198,7 +198,7 @@ public class JavaSystemBackend implements XSingleLayerStratum, XTypeProvider,
public void removeEventListener(com.sun.star.lang.XEventListener xEventListener) {
}
- protected class CommonLayer implements XLayer, XTimeStamped {
+ private class CommonLayer implements XLayer, XTimeStamped {
public void readData(XLayerHandler xLayerHandler)
throws com.sun.star.lang.NullPointerException,
com.sun.star.lang.WrappedTargetException,
diff --git a/qadevOOo/testdocs/qadevlibs/source/test/Job.java b/qadevOOo/testdocs/qadevlibs/source/test/Job.java
index 950eee8..c2aae76 100644
--- a/qadevOOo/testdocs/qadevlibs/source/test/Job.java
+++ b/qadevOOo/testdocs/qadevlibs/source/test/Job.java
@@ -31,13 +31,13 @@ import com.sun.star.comp.loader.FactoryHelper;
public class Job {
- static public class _Implementation implements XServiceInfo, XTypeProvider,
+ static private class _Implementation implements XServiceInfo, XTypeProvider,
XJob, XNamed {
static private final String __serviceName = "test.Job";
Object oDoc = null;
String actionType = null;
String actionParm = null;
- XMultiServiceFactory oMSF = null;
+ private XMultiServiceFactory oMSF = null;
public _Implementation(XMultiServiceFactory xMSF) {
@@ -57,7 +57,7 @@ public class Job {
return new String[] {__serviceName};
}
- public static int executed = 0;
+ private static int executed = 0;
public Object execute(NamedValue[] args) {
executed++;
diff --git a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
index 5a6d42c..fe3b94b 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
@@ -567,7 +567,7 @@ public class ORowSet extends TestCase {
* for the XCompletedExecution test
* @see ifc.sdb._XCompletedExecution
*/
- public class InteractionHandlerImpl implements _XCompletedExecution.CheckInteractionHandler {
+ private class InteractionHandlerImpl implements _XCompletedExecution.CheckInteractionHandler {
private boolean handlerWasUsed = false;
private PrintWriter log = new PrintWriter(System.out);
diff --git a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
index ed7ba40..0a0f7b3 100644
--- a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
+++ b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
@@ -493,12 +493,12 @@ public class GenericModelTest extends TestCase {
} // finish method getTestEnvironment
- static class Checker implements ifc.form._XUpdateBroadcaster.UpdateChecker {
+ private static class Checker implements ifc.form._XUpdateBroadcaster.UpdateChecker {
private Object lastValue = null;
- XLoadable formLoaderF = null;
- XPropertySet ps = null;
- XInterface ctrl = null;
- String ChangePropertyName = null;
+ private XLoadable formLoaderF = null;
+ private XPropertySet ps = null;
+ private XInterface ctrl = null;
+ private String ChangePropertyName = null;
Object ChangePropertyValue = null;
public Checker(XLoadable xl, XPropertySet ps, XInterface ctrl, String ChangePropertyName, Object ChangePropertyValue) {
diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
index 8a1b43c..72755f0 100644
--- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
+++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
@@ -783,9 +783,9 @@ public class ODatabaseForm extends TestCase {
* for the XDatabaseParameterBroadcaster test
* @see ifc.form._XDatabaseParameterBroadcaster
*/
- public class ParameterListenerImpl implements _XDatabaseParameterBroadcaster.CheckParameterListener {
- boolean listenerWasCalled = false;
- PrintWriter log = new PrintWriter(System.out);
+ private class ParameterListenerImpl implements _XDatabaseParameterBroadcaster.CheckParameterListener {
+ private boolean listenerWasCalled = false;
+ private PrintWriter log = new PrintWriter(System.out);
/**
* Return true, if the listener was called, false otherwise.
@@ -845,7 +845,7 @@ public class ODatabaseForm extends TestCase {
* for the XCompletedExecution test
* @see ifc.sdb._XCompletedExecution
*/
- public class InteractionHandlerImpl implements _XCompletedExecution.CheckInteractionHandler {
+ private class InteractionHandlerImpl implements _XCompletedExecution.CheckInteractionHandler {
private boolean handlerWasUsed = false;
private PrintWriter log = new PrintWriter(System.out);
diff --git a/qadevOOo/tests/java/mod/_forms/OListBoxModel.java b/qadevOOo/tests/java/mod/_forms/OListBoxModel.java
index c5d61c7..69db571 100644
--- a/qadevOOo/tests/java/mod/_forms/OListBoxModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OListBoxModel.java
@@ -183,12 +183,12 @@ public class OListBoxModel extends GenericModelTest {
return tEnv;
}
- static class Checker implements UpdateChecker {
+ private static class Checker implements UpdateChecker {
private short lastItem = (short) 0;
- XLoadable formLoaderF = null;
- XPropertySet ps = null;
- XInterface ctrl = null;
- String ChangePropertyName = null;
+ private XLoadable formLoaderF = null;
+ private XPropertySet ps = null;
+ private XInterface ctrl = null;
+ private String ChangePropertyName = null;
Object ChangePropertyValue = null;
public Checker(XLoadable xl, XPropertySet ps, XInterface ctrl, String ChangePropertyName, Object ChangePropertyValue) {
diff --git a/qadevOOo/tests/java/mod/_forms/OTimeModel.java b/qadevOOo/tests/java/mod/_forms/OTimeModel.java
index e2caa81..4e1525b 100644
--- a/qadevOOo/tests/java/mod/_forms/OTimeModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OTimeModel.java
@@ -176,11 +176,11 @@ public class OTimeModel extends GenericModelTest {
return tEnv;
}
- static class Checker implements UpdateChecker {
- XLoadable formLoaderF = null;
- XPropertySet ps = null;
- XInterface ctrl = null;
- String ChangePropertyName = null;
+ private static class Checker implements UpdateChecker {
+ private XLoadable formLoaderF = null;
+ private XPropertySet ps = null;
+ private XInterface ctrl = null;
+ private String ChangePropertyName = null;
Object ChangePropertyValue = null;
public Checker(XLoadable xl, XPropertySet ps, XInterface ctrl, String ChangePropertyName, Object ChangePropertyValue) {
diff --git a/qadevOOo/tests/java/mod/_fwk/JobExecutor.java b/qadevOOo/tests/java/mod/_fwk/JobExecutor.java
index 8cf372d..8816fe1 100644
--- a/qadevOOo/tests/java/mod/_fwk/JobExecutor.java
+++ b/qadevOOo/tests/java/mod/_fwk/JobExecutor.java
@@ -273,8 +273,8 @@ class Job implements
}
}
- public static final String __serviceName = "test.Job";
- static Impl impl = new Impl();
+ private static final String __serviceName = "test.Job";
+ private static Impl impl = new Impl();
public Object createInstanceWithArguments(Object[] args) {
return impl;
diff --git a/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java b/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java
index e572e3d..13dd311 100644
--- a/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java
+++ b/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java
@@ -122,13 +122,13 @@ public class ModuleUIConfigurationManager extends TestCase {
* interface to trigger the event for a listener call.
* @see ifc.ui._XUIConfiguration
*/
- public static class ConfigurationListener implements _XUIConfiguration.XUIConfigurationListenerImpl {
+ private static class ConfigurationListener implements _XUIConfiguration.XUIConfigurationListenerImpl {
private boolean triggered = false;
private final PrintWriter log;
private final XUIConfigurationManager xUIManager;
private final XMultiServiceFactory xMSF;
- public ConfigurationListener(PrintWriter _log, XUIConfigurationManager xUIManager, XMultiServiceFactory xMSF) {
+ private ConfigurationListener(PrintWriter _log, XUIConfigurationManager xUIManager, XMultiServiceFactory xMSF) {
log = _log;
this.xUIManager = xUIManager;
this.xMSF = xMSF;
diff --git a/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java b/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java
index 75d78cd..d32fb8d 100644
--- a/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java
+++ b/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java
@@ -114,14 +114,14 @@ public class UIConfigurationManager extends TestCase {
* interface to trigger the event for a listener call.
* @see ifc.ui._XUIConfiguration
*/
- public static class ConfigurationListener implements _XUIConfiguration.XUIConfigurationListenerImpl {
+ private static class ConfigurationListener implements _XUIConfiguration.XUIConfigurationListenerImpl {
private boolean triggered = false;
private final PrintWriter log;
private final XUIConfigurationManager xUIManager;
private final XMultiServiceFactory xMSF;
private static int iUniqueCounter;
- public ConfigurationListener(PrintWriter _log, XUIConfigurationManager xUIManager, XMultiServiceFactory xMSF) {
+ private ConfigurationListener(PrintWriter _log, XUIConfigurationManager xUIManager, XMultiServiceFactory xMSF) {
log = _log;
this.xUIManager = xUIManager;
this.xMSF = xMSF;
diff --git a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java
index 7c13274..d23af9a 100644
--- a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java
+++ b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java
@@ -80,7 +80,7 @@ public class various extends TestCase {
*
* @see com.sun.star.bridge.XInstanceProvider
*/
- protected class MyInstanceProvider implements XInstanceProvider {
+ private class MyInstanceProvider implements XInstanceProvider {
/**
* a MultiServiceFactory for creating instances
*
@@ -93,7 +93,7 @@ public class various extends TestCase {
*
* @see com.sun.star.lang.MultiServiceFactory
*/
- public MyInstanceProvider(XMultiServiceFactory xMSF) {
+ private MyInstanceProvider(XMultiServiceFactory xMSF) {
this.xMSF = xMSF;
}
@@ -118,25 +118,25 @@ public class various extends TestCase {
* Then stores exception thrown by call if it occurred, or
* return value.
*/
- protected class AcceptorThread extends Thread {
+ private class AcceptorThread extends Thread {
/**
* If exception occurred during method call it is
* stored in this field.
*/
- public Exception ex = null ;
+ private Exception ex = null ;
private final XAcceptor acc;
private final XInstanceProvider xInstProv;
private final XBridgeFactory xBrdgFctr;
/**
* If method call returns some value it stores in this field.
*/
- public XConnection acceptedCall = null ;
+ private XConnection acceptedCall = null ;
/**
* Creates object which can call <code>accept</code> method
* of the Acceptor object specified.
*/
- public AcceptorThread(XAcceptor acc, XInstanceProvider xInstProv,
+ private AcceptorThread(XAcceptor acc, XInstanceProvider xInstProv,
XBridgeFactory xBrdgFctr) {
this.acc = acc ;
this.xInstProv = xInstProv;
diff --git a/qadevOOo/tests/java/mod/_remotebridge/various.java b/qadevOOo/tests/java/mod/_remotebridge/various.java
index 0bd2b95..a00f98f 100644
--- a/qadevOOo/tests/java/mod/_remotebridge/various.java
+++ b/qadevOOo/tests/java/mod/_remotebridge/various.java
@@ -81,7 +81,7 @@ public class various extends TestCase {
*
* @see com.sun.star.bridge.XInstanceProvider
*/
- protected class MyInstanceProvider implements XInstanceProvider {
+ private class MyInstanceProvider implements XInstanceProvider {
/**
* a MultiServiceFactory for creating instances
*
@@ -94,7 +94,7 @@ public class various extends TestCase {
*
* @see com.sun.star.lang.MultiServiceFactory
*/
- public MyInstanceProvider(XMultiServiceFactory xMSF) {
+ private MyInstanceProvider(XMultiServiceFactory xMSF) {
this.xMSF = xMSF;
}
@@ -119,23 +119,23 @@ public class various extends TestCase {
* Then stores exception thrown by call if it occurred, or
* return value.
*/
- protected class AcceptorThread extends Thread {
+ private class AcceptorThread extends Thread {
/**
* If exception occurred during method call it is
* stored in this field.
*/
- public Exception ex = null ;
+ private Exception ex = null ;
private final XAcceptor acc;
/**
* If method call returns some value it stores in this field.
*/
- public XConnection acceptedCall = null ;
+ private XConnection acceptedCall = null ;
/**
* Creates object which can call <code>accept</code> method
* of the Acceptor object specified.
*/
- public AcceptorThread(XAcceptor acc) {
+ private AcceptorThread(XAcceptor acc) {
this.acc = acc ;
}
diff --git a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java
index 97efd9e..01a80ea 100644
--- a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java
+++ b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java
@@ -167,11 +167,11 @@ public class AccessibleEditableTextPara_HeaderFooter extends TestCase {
/**
* Thread for opening modal dialog 'Print Settings'.
*/
- public class DiagThread extends Thread {
- public XComponent xCalcDoc = null;
- public XMultiServiceFactory msf = null;
+ private class DiagThread extends Thread {
+ private XComponent xCalcDoc = null;
+ private XMultiServiceFactory msf = null;
- public DiagThread(XComponent xCalcDoc, XMultiServiceFactory msf) {
+ private DiagThread(XComponent xCalcDoc, XMultiServiceFactory msf) {
this.xCalcDoc = xCalcDoc;
this.msf = msf;
}
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java
index 13f53b2..bd525d7 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java
@@ -168,13 +168,13 @@ public class ScAccessibleCsvCell extends TestCase {
}
}
- public class loadThread extends Thread {
+ private class loadThread extends Thread {
private final SOfficeFactory SOF;
private final PropertyValue[] args;
public XComponent xSpreadSheedDoc = null;
- public loadThread(SOfficeFactory SOF, PropertyValue[] Args) {
+ private loadThread(SOfficeFactory SOF, PropertyValue[] Args) {
this.SOF = SOF;
this.args = Args;
}
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java
index 1237e98..8d6687c 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java
@@ -154,13 +154,13 @@ public class ScAccessibleCsvGrid extends TestCase {
}
}
- public class loadThread extends Thread {
+ private class loadThread extends Thread {
private final SOfficeFactory SOF;
private final PropertyValue[] args;
public XComponent xSpreadSheedDoc = null;
- public loadThread(SOfficeFactory SOF, PropertyValue[] Args) {
+ private loadThread(SOfficeFactory SOF, PropertyValue[] Args) {
this.SOF = SOF;
this.args = Args;
}
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java
index 45c3f9e..549c8cb 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java
@@ -189,13 +189,13 @@ public class ScAccessibleCsvRuler extends TestCase {
}
}
- public class loadThread extends Thread {
+ private class loadThread extends Thread {
private final SOfficeFactory SOF;
private final PropertyValue[] args;
public XComponent xSpreadSheedDoc = null;
- public loadThread(SOfficeFactory SOF, PropertyValue[] Args) {
+ private loadThread(SOfficeFactory SOF, PropertyValue[] Args) {
this.SOF = SOF;
this.args = Args;
}
diff --git a/qadevOOo/tests/java/mod/_sc/XMLContentExporter.java b/qadevOOo/tests/java/mod/_sc/XMLContentExporter.java
index 5d2979d..aed4929 100644
--- a/qadevOOo/tests/java/mod/_sc/XMLContentExporter.java
+++ b/qadevOOo/tests/java/mod/_sc/XMLContentExporter.java
@@ -182,14 +182,14 @@ public class XMLContentExporter extends TestCase {
* to log specified.
* @see ifc.document._XFilter
*/
- protected class ContentFilterChecker extends XMLTools.XMLTagsChecker
+ private class ContentFilterChecker extends XMLTools.XMLTagsChecker
implements ifc.document._XFilter.FilterChecker {
/**
* Creates a class which will write information
* into log specified.
*/
- public ContentFilterChecker(PrintWriter log) {
+ private ContentFilterChecker(PrintWriter log) {
super(log) ;
}
diff --git a/qadevOOo/tests/java/mod/_sc/XMLExporter.java b/qadevOOo/tests/java/mod/_sc/XMLExporter.java
index d8b9b32..cfc85e4 100644
--- a/qadevOOo/tests/java/mod/_sc/XMLExporter.java
+++ b/qadevOOo/tests/java/mod/_sc/XMLExporter.java
@@ -190,14 +190,14 @@ public class XMLExporter extends TestCase {
* to log specified.
* @see ifc.document._XFilter
*/
- protected class FilterChecker extends XMLTools.XMLChecker
+ private class FilterChecker extends XMLTools.XMLChecker
implements ifc.document._XFilter.FilterChecker {
/**
* Creates a class which will write information
* into log specified.
*/
- public FilterChecker(PrintWriter log) {
+ private FilterChecker(PrintWriter log) {
super(log, false) ;
}
/**
diff --git a/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java
index f2e9e88..6446afd 100644
--- a/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java
+++ b/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java
@@ -172,14 +172,14 @@ public class XMLMetaExporter extends TestCase {
* to log specified.
* @see ifc.document._XFilter
*/
- protected class FilterChecker extends XMLTools.XMLChecker
+ private class FilterChecker extends XMLTools.XMLChecker
implements ifc.document._XFilter.FilterChecker {
/**
* Creates a class which will write information
* into log specified.
*/
- public FilterChecker(PrintWriter log) {
+ private FilterChecker(PrintWriter log) {
super(log,false) ;
}
/**
diff --git a/qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java
index f2b8039..287049d7 100644
--- a/qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java
+++ b/qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java
@@ -173,14 +173,14 @@ public class XMLSettingsExporter extends TestCase {
* to log specified.
* @see ifc.document._XFilter
*/
- protected class SettingsFilterChecker extends XMLTools.XMLChecker
+ private class SettingsFilterChecker extends XMLTools.XMLChecker
implements ifc.document._XFilter.FilterChecker {
/**
* Creates a class which will write information
* into log specified.
*/
- public SettingsFilterChecker(PrintWriter log) {
+ private SettingsFilterChecker(PrintWriter log) {
super(log, false) ;
}
/**
diff --git a/qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java
index d105a47..24c2dcd 100644
--- a/qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java
+++ b/qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java
@@ -177,14 +177,14 @@ public class XMLStylesExporter extends TestCase {
* to log specified.
* @see ifc.document._XFilter
*/
- protected class FilterChecker extends XMLTools.XMLChecker
+ private class FilterChecker extends XMLTools.XMLChecker
implements ifc.document._XFilter.FilterChecker {
/**
* Creates a class which will write information
* into log specified.
*/
- public FilterChecker(PrintWriter log) {
+ private FilterChecker(PrintWriter log) {
super(log,false) ;
}
/**
diff --git a/qadevOOo/tests/java/mod/_sm/XMLExporter.java b/qadevOOo/tests/java/mod/_sm/XMLExporter.java
index d44f26f..05a406d 100644
--- a/qadevOOo/tests/java/mod/_sm/XMLExporter.java
+++ b/qadevOOo/tests/java/mod/_sm/XMLExporter.java
@@ -165,14 +165,14 @@ public class XMLExporter extends TestCase {
* to log specified.
* @see ifc.document._XFilter
*/
- protected class FilterChecker extends XMLTools.XMLChecker
+ private class FilterChecker extends XMLTools.XMLChecker
implements ifc.document._XFilter.FilterChecker {
/**
* Creates a class which will write information
* into log specified.
*/
- public FilterChecker(PrintWriter log) {
+ private FilterChecker(PrintWriter log) {
super(log, true) ;
}
/**
diff --git a/qadevOOo/tests/java/mod/_sm/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_sm/XMLMetaExporter.java
index 0a2e7d4..7f36033 100644
--- a/qadevOOo/tests/java/mod/_sm/XMLMetaExporter.java
+++ b/qadevOOo/tests/java/mod/_sm/XMLMetaExporter.java
@@ -168,14 +168,14 @@ public class XMLMetaExporter extends TestCase {
* to log specified.
* @see ifc.document._XFilter
*/
- protected class FilterChecker extends XMLTools.XMLChecker
+ private class FilterChecker extends XMLTools.XMLChecker
implements ifc.document._XFilter.FilterChecker {
/**
* Creates a class which will write information
* into log specified.
*/
- public FilterChecker(PrintWriter log) {
+ private FilterChecker(PrintWriter log) {
super(log, true) ;
}
/**
diff --git a/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java
index 501e2b8..f187629 100644
--- a/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java
+++ b/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java
@@ -166,14 +166,14 @@ public class XMLSettingsExporter extends TestCase {
* to log specified.
* @see ifc.document._XFilter
*/
- protected class FilterChecker extends XMLTools.XMLChecker
+ private class FilterChecker extends XMLTools.XMLChecker
implements ifc.document._XFilter.FilterChecker {
/**
* Creates a class which will write information
* into log specified.
*/
- public FilterChecker(PrintWriter log) {
+ private FilterChecker(PrintWriter log) {
super(log, true) ;
}
/**
diff --git a/qadevOOo/tests/java/mod/_sw/XMLContentExporter.java b/qadevOOo/tests/java/mod/_sw/XMLContentExporter.java
index 9012497..3ada74f 100644
--- a/qadevOOo/tests/java/mod/_sw/XMLContentExporter.java
+++ b/qadevOOo/tests/java/mod/_sw/XMLContentExporter.java
@@ -164,14 +164,14 @@ public class XMLContentExporter extends TestCase {
* to log specified.
* @see ifc.document._XFilter
*/
- protected class ContentFilterChecker extends XMLTools.XMLTagsChecker
+ private class ContentFilterChecker extends XMLTools.XMLTagsChecker
implements ifc.document._XFilter.FilterChecker {
/**
* Creates a class which will write information
* into log specified.
*/
- public ContentFilterChecker(PrintWriter log) {
+ private ContentFilterChecker(PrintWriter log) {
super(log) ;
}
diff --git a/qadevOOo/tests/java/mod/_sw/XMLExporter.java b/qadevOOo/tests/java/mod/_sw/XMLExporter.java
index 967389f..f3c8d43 100644
--- a/qadevOOo/tests/java/mod/_sw/XMLExporter.java
+++ b/qadevOOo/tests/java/mod/_sw/XMLExporter.java
@@ -168,14 +168,14 @@ public class XMLExporter extends TestCase {
* to log specified.
* @see ifc.document._XFilter
*/
- protected class FilterChecker extends XMLTools.XMLTagsChecker
+ private class FilterChecker extends XMLTools.XMLTagsChecker
implements ifc.document._XFilter.FilterChecker {
/**
* Creates a class which will write information
* into log specified.
*/
- public FilterChecker(PrintWriter log) {
+ private FilterChecker(PrintWriter log) {
super(log) ;
}
/**
diff --git a/qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java
index 3bc5159..c8553ab 100644
--- a/qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java
+++ b/qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java
@@ -165,14 +165,14 @@ public class XMLMetaExporter extends TestCase {
* to log specified.
* @see ifc.document._XFilter
*/
- protected class MetaFilterChecker extends XMLTools.XMLTagsChecker
+ private class MetaFilterChecker extends XMLTools.XMLTagsChecker
implements ifc.document._XFilter.FilterChecker {
/**
* Creates a class which will write information
* into log specified.
*/
- public MetaFilterChecker(PrintWriter log) {
+ private MetaFilterChecker(PrintWriter log) {
super(log) ;
}
diff --git a/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java
index d0943ae..7b408a5 100644
--- a/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java
+++ b/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java
@@ -176,14 +176,14 @@ public class XMLSettingsExporter extends TestCase {
* to log specified.
* @see ifc.document._XFilter
*/
- protected class SettingsFilterChecker extends XMLTools.XMLChecker
+ private class SettingsFilterChecker extends XMLTools.XMLChecker
implements ifc.document._XFilter.FilterChecker {
/**
* Creates a class which will write information
* into log specified.
*/
- public SettingsFilterChecker(PrintWriter log) {
+ private SettingsFilterChecker(PrintWriter log) {
super(log, false) ;
}
diff --git a/qadevOOo/tests/java/mod/_sw/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_sw/XMLStylesExporter.java
index 9196d13..7fb9921 100644
--- a/qadevOOo/tests/java/mod/_sw/XMLStylesExporter.java
+++ b/qadevOOo/tests/java/mod/_sw/XMLStylesExporter.java
@@ -170,14 +170,14 @@ public class XMLStylesExporter extends TestCase {
* to log specified.
* @see ifc.document._XFilter
*/
- protected class FilterChecker extends XMLTools.XMLChecker
+ private class FilterChecker extends XMLTools.XMLChecker
implements ifc.document._XFilter.FilterChecker {
/**
* Creates a class which will write information
* into log specified.
*/
- public FilterChecker(PrintWriter log) {
+ private FilterChecker(PrintWriter log) {
super(log,false) ;
}
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java
index 07340ad..2a0e703 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java
@@ -192,11 +192,11 @@ public class AccessibleButton extends lib.TestCase {
/**
* Thread for opening modal dialog 'Print Settings'.
*/
- public class DiagThread extends Thread {
- public XTextDocument xTextDoc = null;
- public XMultiServiceFactory msf = null;
+ private class DiagThread extends Thread {
+ private XTextDocument xTextDoc = null;
+ private XMultiServiceFactory msf = null;
- public DiagThread(XTextDocument xTextDoc, XMultiServiceFactory msf) {
+ private DiagThread(XTextDocument xTextDoc, XMultiServiceFactory msf) {
this.xTextDoc = xTextDoc;
this.msf = msf;
}
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java
index 6c90c96..25fa9a7 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java
@@ -208,11 +208,11 @@ public class AccessibleCheckBox extends TestCase {
/**
* Thread for opening modal dialog 'Insert Table'.
*/
- public class DiagThread extends Thread {
- public XTextDocument xTextDoc = null;
- public XMultiServiceFactory msf = null;
+ private class DiagThread extends Thread {
+ private XTextDocument xTextDoc = null;
+ private XMultiServiceFactory msf = null;
- public DiagThread(XTextDocument xTextDoc, XMultiServiceFactory msf) {
+ private DiagThread(XTextDocument xTextDoc, XMultiServiceFactory msf) {
this.xTextDoc = xTextDoc;
this.msf = msf;
}
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java
index 5277703..0174c00 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java
@@ -193,11 +193,11 @@ public class AccessibleComboBox extends TestCase {
/**
* Thread for opening modal dialog 'Character style'.
*/
- public class DiagThread extends Thread {
- public XTextDocument xTextDoc = null;
- public XMultiServiceFactory msf = null;
+ private class DiagThread extends Thread {
+ private XTextDocument xTextDoc = null;
+ private XMultiServiceFactory msf = null;
- public DiagThread(XTextDocument xTextDoc, XMultiServiceFactory msf) {
+ private DiagThread(XTextDocument xTextDoc, XMultiServiceFactory msf) {
this.xTextDoc = xTextDoc;
this.msf = msf;
}
diff --git a/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java b/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java
index aaa9f98..5a403d2 100644
--- a/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java
@@ -80,7 +80,7 @@ public class MutableTreeDataModel extends TestCase {
return tEnv;
} // finish method getTestEnvironment
- public class XTreeDataModelListenerEvent implements ifc.awt.tree._XTreeDataModel.XTreeDataModelListenerEvent{
+ private class XTreeDataModelListenerEvent implements ifc.awt.tree._XTreeDataModel.XTreeDataModelListenerEvent{
public void fireEvent(){
diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java
index 0851161..cb90ae9 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java
@@ -170,14 +170,14 @@ public class XMLContentExporter extends TestCase {
* to log specified.
* @see ifc.document._XFilter
*/
- protected class FilterChecker extends XMLTools.XMLChecker
+ private class FilterChecker extends XMLTools.XMLChecker
implements ifc.document._XFilter.FilterChecker {
/**
* Creates a class which will write information
* into log specified.
*/
- public FilterChecker(PrintWriter log) {
+ private FilterChecker(PrintWriter log) {
super(log, true) ;
}
/**
diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java
index 4ec0431..18047d2 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java
@@ -172,14 +172,14 @@ public class XMLExporter extends TestCase {
* to log specified.
* @see ifc.document._XFilter
*/
- protected class FilterChecker extends XMLTools.XMLChecker
+ private class FilterChecker extends XMLTools.XMLChecker
implements ifc.document._XFilter.FilterChecker {
/**
* Creates a class which will write information
* into log specified.
*/
- public FilterChecker(PrintWriter log) {
+ private FilterChecker(PrintWriter log) {
super(log, true) ;
}
/**
diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java
index f5247f3..c672f14 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java
@@ -160,14 +160,14 @@ public class XMLStylesExporter extends TestCase {
* to log specified.
* @see ifc.document._XFilter
*/
- protected class FilterChecker extends XMLTools.XMLChecker
+ private class FilterChecker extends XMLTools.XMLChecker
implements ifc.document._XFilter.FilterChecker {
/**
* Creates a class which will write information
* into log specified.
*/
- public FilterChecker(PrintWriter log) {
+ private FilterChecker(PrintWriter log) {
super(log, true) ;
}
/**
diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java
index a2009b4..2e6bd3b 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java
@@ -176,14 +176,14 @@ public class XMLContentExporter extends TestCase {
* to log specified.
* @see ifc.document._XFilter
*/
- protected class FilterChecker extends XMLTools.XMLChecker
+ private class FilterChecker extends XMLTools.XMLChecker
implements ifc.document._XFilter.FilterChecker {
/**
* Creates a class which will write information
* into log specified.
*/
- public FilterChecker(PrintWriter log) {
+ private FilterChecker(PrintWriter log) {
super(log,true) ;
}
/**
diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java
index 022a2f6..30542b4 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java
@@ -178,14 +178,14 @@ public class XMLExporter extends TestCase {
* to log specified.
* @see ifc.document._XFilter
*/
- protected class FilterChecker extends XMLTools.XMLChecker
+ private class FilterChecker extends XMLTools.XMLChecker
implements ifc.document._XFilter.FilterChecker {
/**
* Creates a class which will write information
* into log specified.
*/
- public FilterChecker(PrintWriter log) {
+ private FilterChecker(PrintWriter log) {
super(log,true) ;
}
/**
diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java
index a4edaa8..56c82e97 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java
@@ -171,14 +171,14 @@ public class XMLMetaExporter extends TestCase {
* to log specified.
* @see ifc.document._XFilter
*/
- protected class FilterChecker extends XMLTools.XMLChecker
+ private class FilterChecker extends XMLTools.XMLChecker
implements ifc.document._XFilter.FilterChecker {
/**
* Creates a class which will write information
* into log specified.
*/
- public FilterChecker(PrintWriter log) {
+ private FilterChecker(PrintWriter log) {
super(log, true) ;
}
diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java
index 29c2c3b..34a162f 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java
@@ -177,14 +177,14 @@ public class XMLSettingsExporter extends TestCase {
* to log specified.
* @see ifc.document._XFilter
*/
- protected class FilterChecker extends XMLTools.XMLChecker
+ private class FilterChecker extends XMLTools.XMLChecker
implements ifc.document._XFilter.FilterChecker {
/**
* Creates a class which will write information
* into log specified.
*/
- public FilterChecker(PrintWriter log) {
+ private FilterChecker(PrintWriter log) {
super(log, false) ;
}
diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java
index 59b3ade..8ecbb47 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java
@@ -179,14 +179,14 @@ public class XMLStylesExporter extends TestCase {
* to log specified.
* @see ifc.document._XFilter
*/
- protected class FilterChecker extends XMLTools.XMLChecker
+ private class FilterChecker extends XMLTools.XMLChecker
implements ifc.document._XFilter.FilterChecker {
/**
* Creates a class which will write information
* into log specified.
*/
- public FilterChecker(PrintWriter log) {
+ private FilterChecker(PrintWriter log) {
super(log, false) ;
}
diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java
index ae7572e..aca41f9 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java
@@ -175,14 +175,14 @@ public class XMLContentExporter extends TestCase {
* to log specified.
* @see ifc.document._XFilter
*/
- protected class FilterChecker extends XMLTools.XMLChecker
+ private class FilterChecker extends XMLTools.XMLChecker
implements ifc.document._XFilter.FilterChecker {
/**
* Creates a class which will write information
* into log specified.
*/
- public FilterChecker(PrintWriter log) {
+ private FilterChecker(PrintWriter log) {
super(log, true) ;
}
/**
diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java
index 28c277a..61b1898 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java
@@ -177,14 +177,14 @@ public class XMLExporter extends TestCase {
* to log specified.
* @see ifc.document._XFilter
*/
- protected class FilterChecker extends XMLTools.XMLChecker
+ private class FilterChecker extends XMLTools.XMLChecker
implements ifc.document._XFilter.FilterChecker {
/**
* Creates a class which will write information
* into log specified.
*/
- public FilterChecker(PrintWriter log) {
+ private FilterChecker(PrintWriter log) {
super(log, true) ;
}
/**
diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java
index 0d59606..a9894f5 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java
@@ -173,14 +173,14 @@ public class XMLMetaExporter extends TestCase {
* to log specified.
* @see ifc.document._XFilter
*/
- protected class FilterChecker extends XMLTools.XMLChecker
+ private class FilterChecker extends XMLTools.XMLChecker
implements ifc.document._XFilter.FilterChecker {
/**
* Creates a class which will write information
* into log specified.
*/
- public FilterChecker(PrintWriter log) {
+ private FilterChecker(PrintWriter log) {
super(log, true);
}
/**
diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java
index 2276960..b3a5205 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java
@@ -176,14 +176,14 @@ public class XMLSettingsExporter extends TestCase {
* to log specified.
* @see ifc.document._XFilter
*/
- protected class FilterChecker extends XMLTools.XMLChecker
+ private class FilterChecker extends XMLTools.XMLChecker
implements ifc.document._XFilter.FilterChecker {
/**
* Creates a class which will write information
* into log specified.
*/
- public FilterChecker(PrintWriter log) {
+ private FilterChecker(PrintWriter log) {
super(log,false) ;
}
/**
diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java
index 2567b7b..23f8cefe 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java
@@ -175,14 +175,14 @@ public class XMLStylesExporter extends TestCase {
* to log specified.
* @see ifc.document._XFilter
*/
- protected class FilterChecker extends XMLTools.XMLChecker
+ private class FilterChecker extends XMLTools.XMLChecker
implements ifc.document._XFilter.FilterChecker {
/**
* Creates a class which will write information
* into log specified.
*/
- public FilterChecker(PrintWriter log) {
+ private FilterChecker(PrintWriter log) {
super(log, false) ;
}
/**
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
index 903726c..9caf5ec 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
@@ -200,7 +200,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
}
}
- protected static class GroupContext
+ public static class GroupContext
{
private final GroupContext parent;
@@ -222,7 +222,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
return iterationCount;
}
- public void setIterationCount(final int iterationCount)
+ private void setIterationCount(final int iterationCount)
{
this.iterationCount = iterationCount;
}
@@ -232,7 +232,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
return groupWithRepeatingSection;
}
- public void setGroupWithRepeatingSection(final boolean groupWithRepeatingSection)
+ private void setGroupWithRepeatingSection(final boolean groupWithRepeatingSection)
{
this.groupWithRepeatingSection = groupWithRepeatingSection;
}
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/PageContext.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/PageContext.java
index 1baa240..180635b 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/PageContext.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/PageContext.java
@@ -96,12 +96,12 @@ public class PageContext
return footer;
}
- public CSSNumericValue getHeaderHeight()
+ private CSSNumericValue getHeaderHeight()
{
return headerHeight;
}
- public CSSNumericValue getFooterHeight()
+ private CSSNumericValue getFooterHeight()
{
return footerHeight;
}
diff --git a/sc/qa/complex/dataPilot/_XPropertySet.java b/sc/qa/complex/dataPilot/_XPropertySet.java
index 7573ffc..70875a9 100644
--- a/sc/qa/complex/dataPilot/_XPropertySet.java
+++ b/sc/qa/complex/dataPilot/_XPropertySet.java
@@ -116,9 +116,9 @@ public class _XPropertySet {
* Structure that collects three properties of each type to test :
* Constrained, Bound and Normal.
*/
- public class PropsToTest {
- String constrained = null;
- String bound = null;
+ private class PropsToTest {
+ private String constrained = null;
+ private String bound = null;
String normal = null;
}
@@ -474,7 +474,7 @@ public class _XPropertySet {
* Gets the properties being tested. Searches and stores by one
* property of each kind (Bound, Vetoable, Normal).
*/
- public PropsToTest getPropsToTest(XPropertySetInfo xPSI) {
+ private PropsToTest getPropsToTest(XPropertySetInfo xPSI) {
Property[] properties = xPSI.getProperties();
String bound = "";
diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
index 303bb1a..b0f8658 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
@@ -31,7 +31,7 @@ public class ScriptEntry implements Cloneable {
private Map<String, String> languagedepprops;
- public ScriptEntry(String language, String languagename,
+ private ScriptEntry(String language, String languagename,
String location) {
this.language = language;
@@ -105,7 +105,7 @@ public class ScriptEntry implements Cloneable {
return language;
}
- public String getLocation() {
+ private String getLocation() {
return location;
}
diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
index 95f91d5..fd3c108 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
@@ -62,7 +62,7 @@ public class ScriptMetaData extends ScriptEntry {
return (source != null && hasSource) ? source : null;
}
- public byte[] getSourceBytes() {
+ private byte[] getSourceBytes() {
return (source != null && hasSource) ? source.getBytes() : null;
}
@@ -126,7 +126,7 @@ public class ScriptMetaData extends ScriptEntry {
return result;
}
- public String getLocationPlaceHolder() {
+ private String getLocationPlaceHolder() {
String placeHolder = "Unknown";
String pathToParcel = parent.getPathToParcel();
diff --git a/sot/qa/complex/olesimplestorage/Test01.java b/sot/qa/complex/olesimplestorage/Test01.java
index c07eb22..18d220e 100644
--- a/sot/qa/complex/olesimplestorage/Test01.java
+++ b/sot/qa/complex/olesimplestorage/Test01.java
@@ -28,10 +28,10 @@ import java.util.Random;
public class Test01 implements OLESimpleStorageTest
{
- XMultiServiceFactory m_xMSF = null;
- TestHelper m_aTestHelper = null;
- static final int pStreamCnt = 5;
- static final int pBytesCnt = 10;
+ private XMultiServiceFactory m_xMSF = null;
+ private TestHelper m_aTestHelper = null;
+ private static final int pStreamCnt = 5;
+ private static final int pBytesCnt = 10;
public Test01 ( XMultiServiceFactory xMSF )
{
diff --git a/sot/qa/complex/olesimplestorage/TestHelper.java b/sot/qa/complex/olesimplestorage/TestHelper.java
index eadef83..651ee92 100644
--- a/sot/qa/complex/olesimplestorage/TestHelper.java
+++ b/sot/qa/complex/olesimplestorage/TestHelper.java
@@ -21,7 +21,7 @@ package complex.olesimplestorage;
public class TestHelper
{
- String m_sTestPrefix;
+ private String m_sTestPrefix;
public TestHelper ( String sTestPrefix )
{
diff --git a/svl/qa/complex/passwordcontainer/Test01.java b/svl/qa/complex/passwordcontainer/Test01.java
index fb6b853..d0e9dcc 100644
--- a/svl/qa/complex/passwordcontainer/Test01.java
+++ b/svl/qa/complex/passwordcontainer/Test01.java
@@ -27,9 +27,9 @@ import com.sun.star.uno.UnoRuntime;
public class Test01 implements PasswordContainerTest {
- XMultiServiceFactory m_xMSF = null;
+ private XMultiServiceFactory m_xMSF = null;
XPasswordContainer m_xPasswordContainer = null;
- TestHelper m_aTestHelper = null;
+ private TestHelper m_aTestHelper = null;
public Test01 ( XMultiServiceFactory xMSF )
{
diff --git a/svl/qa/complex/passwordcontainer/Test02.java b/svl/qa/complex/passwordcontainer/Test02.java
index aca3183..1296d77 100644
--- a/svl/qa/complex/passwordcontainer/Test02.java
+++ b/svl/qa/complex/passwordcontainer/Test02.java
@@ -29,9 +29,9 @@ import com.sun.star.uno.UnoRuntime;
public class Test02 implements PasswordContainerTest {
- XMultiServiceFactory m_xMSF = null;
+ private XMultiServiceFactory m_xMSF = null;
XPasswordContainer m_xPasswordContainer = null;
- TestHelper m_aTestHelper = null;
+ private TestHelper m_aTestHelper = null;
public Test02 ( XMultiServiceFactory xMSF )
{
diff --git a/svl/qa/complex/passwordcontainer/Test03.java b/svl/qa/complex/passwordcontainer/Test03.java
index 93df47a..d9b3e35 100644
--- a/svl/qa/complex/passwordcontainer/Test03.java
+++ b/svl/qa/complex/passwordcontainer/Test03.java
@@ -30,9 +30,9 @@ import com.sun.star.uno.UnoRuntime;
public class Test03 implements PasswordContainerTest {
- XMultiServiceFactory m_xMSF = null;
+ private XMultiServiceFactory m_xMSF = null;
XPasswordContainer m_xPasswordContainer = null;
- TestHelper m_aTestHelper = null;
+ private TestHelper m_aTestHelper = null;
public Test03 ( XMultiServiceFactory xMSF )
{
diff --git a/svl/qa/complex/passwordcontainer/TestHelper.java b/svl/qa/complex/passwordcontainer/TestHelper.java
index 1057401..b6f1f08 100644
--- a/svl/qa/complex/passwordcontainer/TestHelper.java
+++ b/svl/qa/complex/passwordcontainer/TestHelper.java
@@ -22,7 +22,7 @@ import com.sun.star.task.UserRecord;
public class TestHelper {
- String m_sTestPrefix;
+ private String m_sTestPrefix;
public TestHelper( String sTestPrefix ) {
m_sTestPrefix = sTestPrefix;
@@ -32,7 +32,7 @@ public class TestHelper {
System.out.println( m_sTestPrefix + "Error: " + sError );
}
- public void Message( String sMessage ) {
+ private void Message( String sMessage ) {
System.out.println( m_sTestPrefix + sMessage );
}
diff --git a/sw/qa/complex/writer/LoadSaveTest.java b/sw/qa/complex/writer/LoadSaveTest.java
index f617a93..e2ae7ab 100644
--- a/sw/qa/complex/writer/LoadSaveTest.java
+++ b/sw/qa/complex/writer/LoadSaveTest.java
@@ -148,10 +148,10 @@ public class LoadSaveTest
}
}
- class EventListener implements XDocumentEventListener
+ private class EventListener implements XDocumentEventListener
{
- boolean m_isLayoutFinished = false;
- boolean IsLayoutFinished() { return m_isLayoutFinished; }
+ private boolean m_isLayoutFinished = false;
+ private boolean IsLayoutFinished() { return m_isLayoutFinished; }
public void documentEventOccured(DocumentEvent Event)
{
if ("OnLayoutFinished".equals(Event.EventName))
diff --git a/sw/qa/complex/writer/TextPortionEnumerationTest.java b/sw/qa/complex/writer/TextPortionEnumerationTest.java
index ed5885b..db99d69 100644
--- a/sw/qa/complex/writer/TextPortionEnumerationTest.java
+++ b/sw/qa/complex/writer/TextPortionEnumerationTest.java
@@ -3365,7 +3365,7 @@ public class TextPortionEnumerationTest
assertEquals("gotoEndOfWord(): wrong string", "Text", string);
}
- abstract class AttachHelper
+ private abstract class AttachHelper
{
abstract boolean isAttribute();
abstract TreeNode mkTreeNode();
diff --git a/testtools/com/sun/star/comp/bridge/TestComponentMain.java b/testtools/com/sun/star/comp/bridge/TestComponentMain.java
index bcb5d8f..eaeab8d 100644
--- a/testtools/com/sun/star/comp/bridge/TestComponentMain.java
+++ b/testtools/com/sun/star/comp/bridge/TestComponentMain.java
@@ -38,8 +38,8 @@ import com.sun.star.uno.UnoRuntime;
public class TestComponentMain
{
- static class InstanceProvider implements XInstanceProvider {
- XComponentContext ctx;
+ private static class InstanceProvider implements XInstanceProvider {
+ private XComponentContext ctx;
public InstanceProvider( XComponentContext ctx )
{
diff --git a/testtools/qa/cli/CLITest.java b/testtools/qa/cli/CLITest.java
index 29ba7a23..13755dc 100644
--- a/testtools/qa/cli/CLITest.java
+++ b/testtools/qa/cli/CLITest.java
@@ -78,7 +78,7 @@ public class CLITest extends ComplexTestCase
*/
class Reader extends Thread
{
- InputStream is;
+ private InputStream is;
public Reader(InputStream stream)
{
is = stream;
diff --git a/testtools/qa/cliversioning/VersionTestCase.java b/testtools/qa/cliversioning/VersionTestCase.java
index 3a3d666..c430443 100644
--- a/testtools/qa/cliversioning/VersionTestCase.java
+++ b/testtools/qa/cliversioning/VersionTestCase.java
@@ -76,7 +76,7 @@ public class VersionTestCase extends ComplexTestCase
*/
class Reader extends Thread
{
- java.io.InputStream is;
+ private java.io.InputStream is;
public Reader(java.io.InputStream stream)
{
is = stream;
diff --git a/toolkit/test/accessibility/AccTreeNode.java b/toolkit/test/accessibility/AccTreeNode.java
index 73fa129..f728d85 100644
--- a/toolkit/test/accessibility/AccTreeNode.java
+++ b/toolkit/test/accessibility/AccTreeNode.java
@@ -38,15 +38,15 @@ import com.sun.star.uno.UnoRuntime;
class AccTreeNode
extends AccessibleTreeNode
{
- class HandlerDescriptor
+ private class HandlerDescriptor
{
- public HandlerDescriptor (NodeHandler aHandler)
+ private HandlerDescriptor (NodeHandler aHandler)
{
maHandler = aHandler;
mnChildCount = -1;
}
- public NodeHandler maHandler;
- public int mnChildCount;
+ private NodeHandler maHandler;
+ private int mnChildCount;
}
/// NodeHandlers for this node
private ArrayList<HandlerDescriptor> maHandlers;
@@ -158,7 +158,7 @@ class AccTreeNode
/** iterate over handlers and return child sum */
- protected HandlerDescriptor getHandlerDescriptor (int i)
+ private HandlerDescriptor getHandlerDescriptor (int i)
{
HandlerDescriptor aDescriptor = maHandlers.get(i);
if (aDescriptor.mnChildCount < 0)
diff --git a/toolkit/test/accessibility/AccessibilityTree.java b/toolkit/test/accessibility/AccessibilityTree.java
index 844065d..f1210af 100644
--- a/toolkit/test/accessibility/AccessibilityTree.java
+++ b/toolkit/test/accessibility/AccessibilityTree.java
@@ -113,7 +113,7 @@ public class AccessibilityTree
/** Expand the nodes in the subtree rooted in aNode according to the
specified expander. The tree is locked during the expansion.
*/
- protected void expandTree (AccessibleTreeNode aNode, Expander aExpander)
+ private void expandTree (AccessibleTreeNode aNode, Expander aExpander)
{
if (mnExpandLevel == 0)
{
@@ -189,7 +189,7 @@ public class AccessibilityTree
{
expandShapes ((AccessibleTreeNode)maTree.getModel().getRoot());
}
- public void expandShapes (AccessibleTreeNode aNode)
+ private void expandShapes (AccessibleTreeNode aNode)
{
expandTree (aNode, new ShapeExpander());
}
@@ -199,7 +199,7 @@ public class AccessibilityTree
{
expandAll ((AccessibleTreeNode)maTree.getModel().getRoot());
}
- public void expandAll (AccessibleTreeNode aNode)
+ private void expandAll (AccessibleTreeNode aNode)
{
expandTree (aNode, new AllExpander());
}
@@ -222,7 +222,7 @@ public class AccessibilityTree
}
*/
- class MouseListener extends MouseAdapter
+ private class MouseListener extends MouseAdapter
{
public MouseListener (AccessibilityTree aTree)
{
@@ -239,7 +239,7 @@ public class AccessibilityTree
@Override
public void mouseReleased(MouseEvent e) { popupTrigger(e); }
- public boolean popupTrigger( MouseEvent e )
+ private boolean popupTrigger( MouseEvent e )
{
boolean bIsPopup = e.isPopupTrigger();
if( !bIsPopup )
@@ -296,12 +296,12 @@ public class AccessibilityTree
private final AccessibilityTree maTree;
}
- class NodeAction extends AbstractAction
+ private class NodeAction extends AbstractAction
{
private final int mnIndex;
private final AccessibleTreeNode maNode;
- public NodeAction( String aName, AccessibleTreeNode aNode, int nIndex )
+ private NodeAction( String aName, AccessibleTreeNode aNode, int nIndex )
{
super( aName );
maNode = aNode;
@@ -315,7 +315,7 @@ public class AccessibilityTree
}
// This action expands all shapes in the subtree rooted in the specified node.
- class ShapeExpandAction extends AbstractAction
+ private class ShapeExpandAction extends AbstractAction
{
private final AccessibilityTree maTree;
private final AccTreeNode maNode;
@@ -332,7 +332,7 @@ public class AccessibilityTree
}
// This action expands all nodes in the subtree rooted in the specified node.
- class SubtreeExpandAction extends AbstractAction
+ private class SubtreeExpandAction extends AbstractAction
{
private final AccessibilityTree maTree;
private final AccTreeNode maNode;
@@ -350,20 +350,20 @@ public class AccessibilityTree
/** Predicate class to determine whether a node should be expanded
* For use with expandTree method */
- abstract class Expander
+ private abstract class Expander
{
abstract public boolean expand (Object aObject);
}
/** expand all nodes */
- class AllExpander extends Expander
+ private class AllExpander extends Expander
{
@Override
public boolean expand(Object aObject) { return true; }
}
/** expand all nodes with accessibility roles > 100 */
- class ShapeExpander extends Expander
+ private class ShapeExpander extends Expander
{
@Override
public boolean expand (Object aObject)
@@ -382,7 +382,7 @@ public class AccessibilityTree
- protected AccessibleTreeCellRenderer maCellRenderer;
+ private AccessibleTreeCellRenderer maCellRenderer;
private final JTree maTree;
private int mnExpandLevel;
}
diff --git a/toolkit/test/accessibility/AccessibilityTreeModel.java b/toolkit/test/accessibility/AccessibilityTreeModel.java
index cee0f86..4bf258c 100644
--- a/toolkit/test/accessibility/AccessibilityTreeModel.java
+++ b/toolkit/test/accessibility/AccessibilityTreeModel.java
@@ -30,7 +30,7 @@ import com.sun.star.uno.UnoRuntime;
public class AccessibilityTreeModel
extends AccessibilityTreeModelBase
{
- public boolean mbVerbose = false;
+ private boolean mbVerbose = false;
public AccessibilityTreeModel (AccessibleTreeNode aRoot)
{
@@ -147,7 +147,7 @@ public class AccessibilityTreeModel
/** Remove a node (and all children) from the tree model.
*/
- protected boolean removeChild (AccessibleTreeNode aNode)
+ private boolean removeChild (AccessibleTreeNode aNode)
{
try
{
@@ -206,7 +206,7 @@ public class AccessibilityTreeModel
Returns the new or existing representation of the specified
accessible object.
*/
- protected AccessibleTreeNode addChild (AccTreeNode aParentNode, XAccessible xNewChild)
+ private AccessibleTreeNode addChild (AccTreeNode aParentNode, XAccessible xNewChild)
{
AccessibleTreeNode aChildNode = null;
try
@@ -258,7 +258,7 @@ public class AccessibilityTreeModel
@param aNode
The node to insert into the internal tree structure.
*/
- protected boolean addNode (AccessibleTreeNode aNode)
+ private boolean addNode (AccessibleTreeNode aNode)
{
boolean bRet = false;
try
@@ -293,7 +293,7 @@ public class AccessibilityTreeModel
/** create path to node, suitable for TreeModelEvent constructor
* @see javax.swing.event.TreeModelEvent#TreeModelEvent
*/
- protected Object[] createPath (AccessibleTreeNode aNode)
+ private Object[] createPath (AccessibleTreeNode aNode)
{
ArrayList<AccessibleTreeNode> aPath = new ArrayList<AccessibleTreeNode>();
aNode.createPath (aPath);
@@ -307,7 +307,7 @@ public class AccessibilityTreeModel
// tree cache, and we should get removed as soon as they are out.
- protected void fireTreeNodesChanged(TreeModelEvent e)
+ private void fireTreeNodesChanged(TreeModelEvent e)
{
for(int i = 0; i < maTMListeners.size(); i++)
{
@@ -323,7 +323,7 @@ public class AccessibilityTreeModel
}
}
- protected void fireTreeNodesRemoved(final TreeModelEvent e)
+ private void fireTreeNodesRemoved(final TreeModelEvent e)
{
for(int i = 0; i < maTMListeners.size(); i++)
{
@@ -331,7 +331,7 @@ public class AccessibilityTreeModel
}
}
- protected void fireTreeStructureChanged(final TreeModelEvent e)
+ private void fireTreeStructureChanged(final TreeModelEvent e)
{
for(int i = 0; i < maTMListeners.size(); i++)
{
@@ -348,13 +348,13 @@ public class AccessibilityTreeModel
/** Create a TreeModelEvent object that informs listeners that one child
has been removed from or inserted into its parent.
*/
- public TreeModelEvent createChildUpdateEvent (XAccessibleContext xParent)
+ private TreeModelEvent createChildUpdateEvent (XAccessibleContext xParent)
{
AccessibleTreeNode aParentNode = maNodeMap.GetNode (xParent);
return createEvent (aParentNode, xParent);
}
- public TreeModelEvent createEvent (AccessibleTreeNode aParentNode, XAccessibleContext xChild)
+ private TreeModelEvent createEvent (AccessibleTreeNode aParentNode, XAccessibleContext xChild)
{
AccessibleTreeNode aChildNode = null;
if (xChild != null)
@@ -394,7 +394,7 @@ public class AccessibilityTreeModel
/** Create a TreeModelEvent that indicates changes at those children of
the specified node with the specified indices.
*/
- protected TreeModelEvent createChangeEvent (AccTreeNode aNode, java.util.List<Integer> aChildIndices)
+ private TreeModelEvent createChangeEvent (AccTreeNode aNode, java.util.List<Integer> aChildIndices)
{
// Build a list of child objects that are indicated by the given indices.
int nCount = aChildIndices.size();
@@ -415,7 +415,7 @@ public class AccessibilityTreeModel
- protected XAccessibleEventBroadcaster getBroadcaster (Object aObject)
+ private XAccessibleEventBroadcaster getBroadcaster (Object aObject)
{
if (aObject instanceof AccTreeNode)
return UnoRuntime.queryInterface (
@@ -424,7 +424,7 @@ public class AccessibilityTreeModel
return null;
}
- protected void registerAccListener( Object aObject )
+ private void registerAccListener( Object aObject )
{
// register this as listener for XAccessibleEventBroadcaster
// implementations
@@ -435,7 +435,7 @@ public class AccessibilityTreeModel
}
}
- protected void removeAccListener( Object aObject )
+ private void removeAccListener( Object aObject )
{
XAccessibleEventBroadcaster xBroadcaster = getBroadcaster( aObject );
if (xBroadcaster != null)
diff --git a/toolkit/test/accessibility/AccessibilityWorkBench.java b/toolkit/test/accessibility/AccessibilityWorkBench.java
index a069c97..4e29d67 100644
--- a/toolkit/test/accessibility/AccessibilityWorkBench.java
+++ b/toolkit/test/accessibility/AccessibilityWorkBench.java
@@ -43,8 +43,8 @@ public class AccessibilityWorkBench
implements ActionListener, XTerminateListener, TreeSelectionListener
{
- public static final String msVersion = "v1.7.2";
- public String msOptionsFileName = ".AWBrc";
+ private static final String msVersion = "v1.7.2";
+ private String msOptionsFileName = ".AWBrc";
public static void main (String args[])
{
@@ -116,7 +116,7 @@ public class AccessibilityWorkBench
/** Create and arrange the widgets of the GUI.
*/
- public void Layout ()
+ private void Layout ()
{
setSize (new Dimension (8000,600));
@@ -209,7 +209,7 @@ public class AccessibilityWorkBench
/** Shortcut method for adding an object to a GridBagLayout.
*/
- void addGridElement (JComponent object,
+ private void addGridElement (JComponent object,
int x, int y, int width, int height, int weightx, int weighty,
int anchor, int fill)
{
@@ -231,7 +231,7 @@ public class AccessibilityWorkBench
/** Create a new button and place at the right most position into the
button bar.
*/
- public JButton createButton (String title, String command)
+ private JButton createButton (String title, String command)
{
JButton aButton = new JButton (title);
aButton.setEnabled (false);
@@ -250,7 +250,7 @@ public class AccessibilityWorkBench
Returns the new menu bar. The returned reference is also
remembered in the data member <member>maMenuBar</member>.
*/
- JMenuBar CreateMenuBar ()
+ private JMenuBar CreateMenuBar ()
{
// Menu bar.
JMenuBar aMenuBar = new JMenuBar ();
@@ -342,7 +342,7 @@ public class AccessibilityWorkBench
actions will be carried out every time. The main purpose of a
second call is that of a re-initialization after a reconnect.
*/
- protected void initialize ()
+ private void initialize ()
{
maCanvas.clear();
@@ -385,7 +385,7 @@ public class AccessibilityWorkBench
/** Update the states of the buttons according to the internal state of
the AWB.
*/
- protected void UpdateButtonStates ()
+ private void UpdateButtonStates ()
{
aConnectButton.setEnabled (mbInitialized);
aQuitButton.setEnabled (mbInitialized);
@@ -566,9 +566,9 @@ public class AccessibilityWorkBench
private static AccessibilityWorkBench
saWorkBench = null;
- protected SimpleOffice
+ private SimpleOffice
office;
- protected InformationWriter
+ private InformationWriter
info;
private JPanel
diff --git a/toolkit/test/accessibility/AccessibleActionHandler.java b/toolkit/test/accessibility/AccessibleActionHandler.java
index 4abfb09..868ea11 100644
--- a/toolkit/test/accessibility/AccessibleActionHandler.java
+++ b/toolkit/test/accessibility/AccessibleActionHandler.java
@@ -40,7 +40,7 @@ class AccessibleActionHandler
{
}
- public AccessibleActionHandler (XAccessibleAction xAction)
+ private AccessibleActionHandler (XAccessibleAction xAction)
{
if (xAction != null)
maChildList.setSize (1 + xAction.getAccessibleActionCount());
diff --git a/toolkit/test/accessibility/AccessibleCellHandler.java b/toolkit/test/accessibility/AccessibleCellHandler.java
index d99fdbf..c52532d 100644
--- a/toolkit/test/accessibility/AccessibleCellHandler.java
+++ b/toolkit/test/accessibility/AccessibleCellHandler.java
@@ -47,7 +47,7 @@ class AccessibleCellHandler extends NodeHandler
{
}
- public AccessibleCellHandler (XAccessibleTable xTable)
+ private AccessibleCellHandler (XAccessibleTable xTable)
{
if (xTable != null)
maChildList.setSize (8);
diff --git a/toolkit/test/accessibility/AccessibleComponentHandler.java b/toolkit/test/accessibility/AccessibleComponentHandler.java
index 01a86c8..7420a00 100644
--- a/toolkit/test/accessibility/AccessibleComponentHandler.java
+++ b/toolkit/test/accessibility/AccessibleComponentHandler.java
@@ -42,7 +42,7 @@ class AccessibleComponentHandler
{
}
- public AccessibleComponentHandler (XAccessibleComponent xComponent)
+ private AccessibleComponentHandler (XAccessibleComponent xComponent)
{
if (xComponent != null)
maChildList.setSize (6);
diff --git a/toolkit/test/accessibility/AccessibleContextHandler.java b/toolkit/test/accessibility/AccessibleContextHandler.java
index 8409a9a..9483c5c 100644
--- a/toolkit/test/accessibility/AccessibleContextHandler.java
+++ b/toolkit/test/accessibility/AccessibleContextHandler.java
@@ -40,7 +40,7 @@ class AccessibleContextHandler
super ();
}
- public AccessibleContextHandler (XAccessibleContext xContext)
+ private AccessibleContextHandler (XAccessibleContext xContext)
{
super();
if (xContext != null)
diff --git a/toolkit/test/accessibility/AccessibleEditableTextHandler.java b/toolkit/test/accessibility/AccessibleEditableTextHandler.java
index fa9b0d5..a31073b 100644
--- a/toolkit/test/accessibility/AccessibleEditableTextHandler.java
+++ b/toolkit/test/accessibility/AccessibleEditableTextHandler.java
@@ -39,7 +39,7 @@ class AccessibleEditableTextHandler extends NodeHandler
{
}
- public AccessibleEditableTextHandler (XAccessibleEditableText xText)
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list