[Libreoffice-commits] core.git: connectivity/qa javaunohelper/test qadevOOo/runner reportbuilder/java sot/qa svl/qa toolkit/test unoxml/qa wizards/com
Noel Grandin
noel at peralex.com
Fri Dec 19 01:50:07 PST 2014
connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java | 4 ++--
javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java | 2 +-
qadevOOo/runner/complexlib/Assurance.java | 2 +-
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/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 ++--
wizards/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(-)
New commits:
commit 581d1e35f86077ce91a59ad3dc4760cda0b19071
Author: Noel Grandin <noel at peralex.com>
Date: Wed Dec 17 14:23:47 2014 +0200
java: reduce visibility of some methods and fields
found by UCDetector
Change-Id: I0a0a00d1fae1fed2e6aef198b7a1482d7e7e29f0
diff --git a/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
index 9658bca..ba9dcdf 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 083e855..1e1359c 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 f2169b0..9e7d269 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 2ca47ca..1de1f35 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 a2d8bee..f01a141 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 c4e99ec..b96a098 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 dcb0b67..e588e5b 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 6111199..f630b93 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 ae51725..d3756bc 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 a6225b0..da5a7bf 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 d6e03f3..72c17d7 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 d777375..efd66d0 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 c64f9de..52839fe 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 <code>JavaLoader</code>
diff --git a/wizards/com/sun/star/wizards/report/RecordTable.java b/wizards/com/sun/star/wizards/report/RecordTable.java
index 14a8f46..50e605d 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 1431fc2..badd5e5 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 1e79d29..9822b4c 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 a5456c6..cf41446 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<String, FieldDescription> fielditems;
+ HashMap<String, FieldDescription> 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 3543c18..854d144 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 0250f2e..bcc8a9b 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 0690c72..0587e0c 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 001f245..61e5e3f 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.
More information about the Libreoffice-commits
mailing list