From 581d1e35f86077ce91a59ad3dc4760cda0b19071 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 17 Dec 2014 14:23:47 +0200 Subject: java: reduce visibility of some methods and fields found by UCDetector Change-Id: I0a0a00d1fae1fed2e6aef198b7a1482d7e7e29f0 --- connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java | 4 ++-- .../test/com/sun/star/lib/uno/helper/PropertySet_Test.java | 2 +- qadevOOo/runner/complexlib/Assurance.java | 2 +- .../OfficeRepeatingStructureLayoutController.java | 2 +- sot/qa/complex/olesimplestorage/OLESimpleStorageTest.java | 2 +- svl/qa/complex/passwordcontainer/PasswordContainerTest.java | 2 +- toolkit/test/accessibility/SimpleOffice.java | 2 +- unoxml/qa/complex/unoxml/DOMTest.java | 4 ++-- .../com/sun/star/wizards/common/PlaceholderTextElement.java | 2 +- wizards/com/sun/star/wizards/db/CommandMetaData.java | 4 ++-- wizards/com/sun/star/wizards/document/Shape.java | 2 +- wizards/com/sun/star/wizards/document/TimeStampControl.java | 2 +- wizards/com/sun/star/wizards/report/CallReportWizard.java | 2 +- wizards/com/sun/star/wizards/report/RecordTable.java | 6 +++--- wizards/com/sun/star/wizards/report/ReportLayouter.java | 6 +++--- wizards/com/sun/star/wizards/table/FieldFormatter.java | 4 ++-- wizards/com/sun/star/wizards/table/TableWizard.java | 10 +++++----- wizards/com/sun/star/wizards/ui/FilterComponent.java | 6 +++--- wizards/com/sun/star/wizards/ui/PeerConfig.java | 6 +++--- wizards/com/sun/star/wizards/ui/UnoDialog.java | 4 ++-- wizards/com/sun/star/wizards/ui/event/DataAware.java | 2 +- 21 files changed, 38 insertions(+), 38 deletions(-) diff --git a/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java index 9658bca70675..ba9dcdf06dd8 100644 --- a/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java +++ b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java @@ -100,8 +100,8 @@ public class TestCacheSize { private int deleteWhileInsertInterval = 10000; // size of the tables used in test - int bigrows = 10000; - int smallrows = 0xfff; + private int bigrows = 10000; + private int smallrows = 0xfff; // if the extra table needs to be created and filled up private boolean multikeytable = false; diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java index 083e855fa581..1e1359c919cf 100644 --- a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java +++ b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java @@ -1624,7 +1624,7 @@ XPropertiesChangeListener int nChangeCalled; int nPropertiesChange; int nVetoCalled; - int nDisposingCalled; + private int nDisposingCalled; boolean bVeto= false; PropertyChangeEvent evt; PropertyChangeEvent[] arEvt; diff --git a/qadevOOo/runner/complexlib/Assurance.java b/qadevOOo/runner/complexlib/Assurance.java index f2169b02ef59..9e7d269d6f16 100644 --- a/qadevOOo/runner/complexlib/Assurance.java +++ b/qadevOOo/runner/complexlib/Assurance.java @@ -134,7 +134,7 @@ public class Assurance assure(msg, false, cont); } - public class AssureException extends RuntimeException { + public static class AssureException extends RuntimeException { private AssureException(String msg) { super(msg); diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java index 2ca47ca2c1d1..1de1f354afa3 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java @@ -25,7 +25,7 @@ import org.jfree.report.flow.layoutprocessor.LayoutController; * * @since 22.03.2007 */ -public interface OfficeRepeatingStructureLayoutController extends LayoutController +interface OfficeRepeatingStructureLayoutController extends LayoutController { boolean isNormalFlowProcessing(); diff --git a/sot/qa/complex/olesimplestorage/OLESimpleStorageTest.java b/sot/qa/complex/olesimplestorage/OLESimpleStorageTest.java index a2d8bee83713..f01a14178020 100644 --- a/sot/qa/complex/olesimplestorage/OLESimpleStorageTest.java +++ b/sot/qa/complex/olesimplestorage/OLESimpleStorageTest.java @@ -1,5 +1,5 @@ package complex.olesimplestorage; -public interface OLESimpleStorageTest { +interface OLESimpleStorageTest { boolean test(); } diff --git a/svl/qa/complex/passwordcontainer/PasswordContainerTest.java b/svl/qa/complex/passwordcontainer/PasswordContainerTest.java index c4e99ec78921..b96a0986d02b 100644 --- a/svl/qa/complex/passwordcontainer/PasswordContainerTest.java +++ b/svl/qa/complex/passwordcontainer/PasswordContainerTest.java @@ -18,6 +18,6 @@ package complex.passwordcontainer; -public interface PasswordContainerTest { +interface PasswordContainerTest { boolean test(); } diff --git a/toolkit/test/accessibility/SimpleOffice.java b/toolkit/test/accessibility/SimpleOffice.java index dcb0b671c01d..e588e5b9e2fd 100644 --- a/toolkit/test/accessibility/SimpleOffice.java +++ b/toolkit/test/accessibility/SimpleOffice.java @@ -50,7 +50,7 @@ public class SimpleOffice { private XDesktop mxDesktop = null; private OfficeConnection aConnection; - int mnPortNumber; + private int mnPortNumber; public SimpleOffice (int nPortNumber) { diff --git a/unoxml/qa/complex/unoxml/DOMTest.java b/unoxml/qa/complex/unoxml/DOMTest.java index 6111199aca74..f630b9335faf 100644 --- a/unoxml/qa/complex/unoxml/DOMTest.java +++ b/unoxml/qa/complex/unoxml/DOMTest.java @@ -2897,7 +2897,7 @@ public class DOMTest } class MockNodeMap implements XNamedNodeMap { - MockAttr[] m_attributes; + private MockAttr[] m_attributes; MockNodeMap(MockAttr[] attrs) { m_attributes = attrs; } @@ -2932,7 +2932,7 @@ public class DOMTest } class MockElement extends MockNode implements XElement { - MockAttr[] m_attributes; + private MockAttr[] m_attributes; MockElement(String name, MockAttr[] attrs) { m_localname = name; m_attributes = attrs; diff --git a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java index ae517250e65d..d3756bc66329 100644 --- a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java +++ b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java @@ -27,7 +27,7 @@ public class PlaceholderTextElement extends TextElement { private String hint; - String placeHolderText; + private String placeHolderText; private XMultiServiceFactory xmsf; public PlaceholderTextElement(XTextRange textRange, String placeHolderText_, String hint_, XMultiServiceFactory xmsf_) diff --git a/wizards/com/sun/star/wizards/db/CommandMetaData.java b/wizards/com/sun/star/wizards/db/CommandMetaData.java index a6225b053740..da5a7bf00c3b 100644 --- a/wizards/com/sun/star/wizards/db/CommandMetaData.java +++ b/wizards/com/sun/star/wizards/db/CommandMetaData.java @@ -61,8 +61,8 @@ public class CommandMetaData extends DBMetaData private int CommandType; private String Command; private boolean bCatalogAtStart = true; - String sCatalogSep = PropertyNames.EMPTY_STRING; - String sIdentifierQuote = PropertyNames.EMPTY_STRING; + private String sCatalogSep = PropertyNames.EMPTY_STRING; + private String sIdentifierQuote = PropertyNames.EMPTY_STRING; private boolean bCommandComposerAttributesalreadyRetrieved = false; public CommandMetaData(XMultiServiceFactory xMSF) diff --git a/wizards/com/sun/star/wizards/document/Shape.java b/wizards/com/sun/star/wizards/document/Shape.java index d6e03f3449b1..72c17d7f84f1 100644 --- a/wizards/com/sun/star/wizards/document/Shape.java +++ b/wizards/com/sun/star/wizards/document/Shape.java @@ -44,7 +44,7 @@ public class Shape private Size aSize; protected XControlShape xControlShape; private XMultiServiceFactory xMSF; - public XShapes xShapes; + XShapes xShapes; public Shape(FormHandler _oFormHandler, Point _aPoint, Size _aSize) { diff --git a/wizards/com/sun/star/wizards/document/TimeStampControl.java b/wizards/com/sun/star/wizards/document/TimeStampControl.java index d777375503a7..efd66d0e6d79 100644 --- a/wizards/com/sun/star/wizards/document/TimeStampControl.java +++ b/wizards/com/sun/star/wizards/document/TimeStampControl.java @@ -40,7 +40,7 @@ public class TimeStampControl extends DatabaseControl private double nreldatewidth; private double nreltimewidth; private int nDBWidth; - XShape xShapeGroup; + private XShape xShapeGroup; public TimeStampControl(Resource _oResource, FormHandler _oFormHandler, XNameContainer _xFormName, String _curFieldName, Point _aPoint) { diff --git a/wizards/com/sun/star/wizards/report/CallReportWizard.java b/wizards/com/sun/star/wizards/report/CallReportWizard.java index c64f9dea3833..52839fe21703 100644 --- a/wizards/com/sun/star/wizards/report/CallReportWizard.java +++ b/wizards/com/sun/star/wizards/report/CallReportWizard.java @@ -33,7 +33,7 @@ import java.util.logging.Logger; public class CallReportWizard { - static boolean bWizardstartedalready; + private static boolean bWizardstartedalready; /** Gives a factory for creating the service. * This method is called by the JavaLoader diff --git a/wizards/com/sun/star/wizards/report/RecordTable.java b/wizards/com/sun/star/wizards/report/RecordTable.java index 14a8f463337c..50e605dbc5d6 100644 --- a/wizards/com/sun/star/wizards/report/RecordTable.java +++ b/wizards/com/sun/star/wizards/report/RecordTable.java @@ -32,11 +32,11 @@ import com.sun.star.wizards.text.ViewHandler; public class RecordTable { - public XNamed xTableName; - public XCellRange xCellRange; + XNamed xTableName; + XCellRange xCellRange; public XTextTable xTextTable; private TextTableHandler oTextTableHandler; - public XTableColumns xTableColumns; + XTableColumns xTableColumns; public RecordTable(TextTableHandler _oTextTableHandler) { diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java b/wizards/com/sun/star/wizards/report/ReportLayouter.java index 1431fc225355..badd5e55c1b8 100644 --- a/wizards/com/sun/star/wizards/report/ReportLayouter.java +++ b/wizards/com/sun/star/wizards/report/ReportLayouter.java @@ -43,12 +43,12 @@ public class ReportLayouter private static final int SOLAYOUTLST = 32; private XListBox xContentListBox; private XListBox xLayoutListBox; - int iOldContentPos; - int iOldLayoutPos; + private int iOldContentPos; + private int iOldLayoutPos; private IReportDocument CurReportDocument; private String[][] LayoutFiles; private String[][] ContentFiles; - Object aOrientationImage; + private Object aOrientationImage; private final XMultiServiceFactory m_xMSF; private XTextRange trTitleconst, trAuthorconst, trDateconst, trPageconst; private TextElement teTitleconst, teAuthorconst, teDateconst, tePageconst; diff --git a/wizards/com/sun/star/wizards/table/FieldFormatter.java b/wizards/com/sun/star/wizards/table/FieldFormatter.java index 1e79d2964286..9822b4c1f36c 100644 --- a/wizards/com/sun/star/wizards/table/FieldFormatter.java +++ b/wizards/com/sun/star/wizards/table/FieldFormatter.java @@ -49,8 +49,8 @@ public class FieldFormatter implements XItemListener private XButton btnminus; private XButton btnShiftUp; private XButton btnShiftDown; - short curtabindex; - String suntitled; + private short curtabindex; + private String suntitled; private Integer IFieldFormatStep; public FieldFormatter(TableWizard _CurUnoDialog) diff --git a/wizards/com/sun/star/wizards/table/TableWizard.java b/wizards/com/sun/star/wizards/table/TableWizard.java index a5456c6fee40..cf41446ecb6d 100644 --- a/wizards/com/sun/star/wizards/table/TableWizard.java +++ b/wizards/com/sun/star/wizards/table/TableWizard.java @@ -44,12 +44,12 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener private ScenarioSelector curScenarioSelector; private FieldFormatter curFieldFormatter; private PrimaryKeyHandler curPrimaryKeyHandler; - public HashMap fielditems; + HashMap fielditems; int wizardmode; - String tablename; - String serrToManyFields; - String serrTableNameexists; - String scomposedtablename; + private String tablename; + private String serrToManyFields; + private String serrTableNameexists; + private String scomposedtablename; private TableDescriptor curTableDescriptor; public static final int SOMAINPAGE = 1; public static final int SOFIELDSFORMATPAGE = 2; diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java index 3543c18639b9..854d144f15f5 100644 --- a/wizards/com/sun/star/wizards/ui/FilterComponent.java +++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java @@ -99,9 +99,9 @@ public class FilterComponent private static final int SO_SECONDBOOLFIELDNAME = 256 + 2; private static final int SO_THIRDBOOLFIELDNAME = 256 + 3; private static final int SO_FOURTHBOOLFIELDNAME = 256 + 4; - int SOI_MATCHALL = 0; - int SOI_MATCHANY = 1; - int curHelpID; + private int SOI_MATCHALL = 0; + private int SOI_MATCHANY = 1; + private int curHelpID; class ItemListenerImpl implements com.sun.star.awt.XItemListener { diff --git a/wizards/com/sun/star/wizards/ui/PeerConfig.java b/wizards/com/sun/star/wizards/ui/PeerConfig.java index 0250f2e6f816..bcc8a9b8c2e7 100644 --- a/wizards/com/sun/star/wizards/ui/PeerConfig.java +++ b/wizards/com/sun/star/wizards/ui/PeerConfig.java @@ -43,7 +43,7 @@ public class PeerConfig implements XWindowListener oUnoDialog.xWindow.addWindowListener(this); } - class PeerTask + private static class PeerTask { private XControl xControl; @@ -58,7 +58,7 @@ public class PeerConfig implements XWindowListener } } - class ControlTask + private static class ControlTask { Object oModel; @@ -67,7 +67,7 @@ public class PeerConfig implements XWindowListener } - class ImageUrlTask + private static class ImageUrlTask { Object oModel; diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java index 0690c72478db..0587e0cc32e5 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog.java +++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java @@ -35,9 +35,9 @@ public class UnoDialog { public XMultiServiceFactory xMSF; - public XMultiServiceFactory MSFDialogModel; + XMultiServiceFactory MSFDialogModel; private XNameContainer xDlgNames; - public XControlContainer xDlgContainer; + XControlContainer xDlgContainer; private XNameAccess m_xDlgNameAccess; public XControl xControl; public XDialog xDialog; diff --git a/wizards/com/sun/star/wizards/ui/event/DataAware.java b/wizards/com/sun/star/wizards/ui/event/DataAware.java index 001f24537322..61e5e3f8b478 100644 --- a/wizards/com/sun/star/wizards/ui/event/DataAware.java +++ b/wizards/com/sun/star/wizards/ui/event/DataAware.java @@ -152,7 +152,7 @@ public abstract class DataAware { * using JavaBeans properties reflection, and DataAwareFields classes * which implement different member types. */ - public interface Value { + interface Value { /** * gets a value from the given object. * @param target the object to get the value from. -- cgit v1.2.3