diff options
author | Noel Grandin <noel@peralex.com> | 2014-08-08 11:39:00 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-08-13 08:49:23 +0200 |
commit | 70f56bc22fe952c75ec714e05e1bb5296491a36a (patch) | |
tree | af4b3cf94e84cc2f5bf57c002f264eb44c3558af /wizards | |
parent | java: reduce scope, make some interfaces private (diff) | |
download | core-70f56bc22fe952c75ec714e05e1bb5296491a36a.tar.gz core-70f56bc22fe952c75ec714e05e1bb5296491a36a.zip |
java: reduce scope, make member classes private
found by UCDetector
Change-Id: Ief32d078090102b14b60b35fc36542f8d4fb252b
Diffstat (limited to 'wizards')
22 files changed, 32 insertions, 32 deletions
diff --git a/wizards/com/sun/star/wizards/document/FormHandler.java b/wizards/com/sun/star/wizards/document/FormHandler.java index 8aa88ba608f6..72306436c1ca 100644 --- a/wizards/com/sun/star/wizards/document/FormHandler.java +++ b/wizards/com/sun/star/wizards/document/FormHandler.java @@ -92,7 +92,7 @@ public class FormHandler XShapeGrouper xShapeGrouper; private XNameContainer xNamedFormContainer; - public class ControlData + class ControlData { int DataType; diff --git a/wizards/com/sun/star/wizards/form/CallFormWizard.java b/wizards/com/sun/star/wizards/form/CallFormWizard.java index 4bec58437111..fc3177c26268 100644 --- a/wizards/com/sun/star/wizards/form/CallFormWizard.java +++ b/wizards/com/sun/star/wizards/form/CallFormWizard.java @@ -51,7 +51,7 @@ public class CallFormWizard /** This class implements the component. At least the interfaces XServiceInfo, * XTypeProvider, and XInitialization should be provided by the service. */ - public static class FormWizardImplementation extends com.sun.star.lib.uno.helper.PropertySet implements com.sun.star.lang.XInitialization, com.sun.star.lang.XServiceInfo, com.sun.star.task.XJobExecutor + private static class FormWizardImplementation extends com.sun.star.lib.uno.helper.PropertySet implements com.sun.star.lang.XInitialization, com.sun.star.lang.XServiceInfo, com.sun.star.task.XJobExecutor { private PropertyValue[] m_wizardContext; diff --git a/wizards/com/sun/star/wizards/form/FieldLinker.java b/wizards/com/sun/star/wizards/form/FieldLinker.java index 2dd3ab33c09a..53456ff8615c 100644 --- a/wizards/com/sun/star/wizards/form/FieldLinker.java +++ b/wizards/com/sun/star/wizards/form/FieldLinker.java @@ -282,7 +282,7 @@ public class FieldLinker extends DBLimitedFieldSelection CurUnoDialog.setStepEnabled(IStep.intValue(), _bdoenable); } - class ItemListenerImpl implements com.sun.star.awt.XItemListener + private class ItemListenerImpl implements com.sun.star.awt.XItemListener { public void itemStateChanged(ItemEvent EventObject) diff --git a/wizards/com/sun/star/wizards/form/FormWizard.java b/wizards/com/sun/star/wizards/form/FormWizard.java index fc613019f10d..661b86eed06b 100644 --- a/wizards/com/sun/star/wizards/form/FormWizard.java +++ b/wizards/com/sun/star/wizards/form/FormWizard.java @@ -385,7 +385,7 @@ public class FormWizard extends DatabaseObjectWizard return true; } - public class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener + private class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener { private int ID; diff --git a/wizards/com/sun/star/wizards/query/CallQueryWizard.java b/wizards/com/sun/star/wizards/query/CallQueryWizard.java index 611556951fa1..60fc8f61a481 100644 --- a/wizards/com/sun/star/wizards/query/CallQueryWizard.java +++ b/wizards/com/sun/star/wizards/query/CallQueryWizard.java @@ -53,7 +53,7 @@ public class CallQueryWizard /** This class implements the component. At least the interfaces XServiceInfo, * XTypeProvider, and XInitialization should be provided by the service. */ - public static class QueryWizardImplementation extends com.sun.star.lib.uno.helper.PropertySet implements com.sun.star.lang.XInitialization, com.sun.star.lang.XServiceInfo, com.sun.star.task.XJobExecutor + private static class QueryWizardImplementation extends com.sun.star.lib.uno.helper.PropertySet implements com.sun.star.lang.XInitialization, com.sun.star.lang.XServiceInfo, com.sun.star.task.XJobExecutor { private PropertyValue[] m_wizardContext; private String Command; diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java b/wizards/com/sun/star/wizards/query/QueryWizard.java index 78709f14ea00..4e9c1ee40a20 100644 --- a/wizards/com/sun/star/wizards/query/QueryWizard.java +++ b/wizards/com/sun/star/wizards/query/QueryWizard.java @@ -393,7 +393,7 @@ public class QueryWizard extends DatabaseObjectWizard enableRoadmapItems(bEnabled); // Note: Performancewise this could be improved } - public class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener + private class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener { private int ID; diff --git a/wizards/com/sun/star/wizards/report/CallReportWizard.java b/wizards/com/sun/star/wizards/report/CallReportWizard.java index f59dbefdab50..df934cd1eb9c 100644 --- a/wizards/com/sun/star/wizards/report/CallReportWizard.java +++ b/wizards/com/sun/star/wizards/report/CallReportWizard.java @@ -63,7 +63,7 @@ public class CallReportWizard /** This class implements the component. At least the interfaces XServiceInfo, * XTypeProvider, and XInitialization should be provided by the service. */ - public static class ReportWizardImplementation extends com.sun.star.lib.uno.helper.PropertySet implements com.sun.star.lang.XInitialization, com.sun.star.lang.XServiceInfo, com.sun.star.task.XJobExecutor + private static class ReportWizardImplementation extends com.sun.star.lib.uno.helper.PropertySet implements com.sun.star.lang.XInitialization, com.sun.star.lang.XServiceInfo, com.sun.star.task.XJobExecutor { private PropertyValue[] m_wizardContext; diff --git a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java index 31c68ed2aa24..d0e2c1ee0a29 100644 --- a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java +++ b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java @@ -137,7 +137,7 @@ public class GroupFieldHandler extends FieldSelection } - /* protected */ class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener + /* protected */ private class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener { public void moveItemDown(String Selitem) diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java b/wizards/com/sun/star/wizards/report/ReportLayouter.java index 1028747ceedd..15f8d4b99b63 100644 --- a/wizards/com/sun/star/wizards/report/ReportLayouter.java +++ b/wizards/com/sun/star/wizards/report/ReportLayouter.java @@ -217,7 +217,7 @@ public class ReportLayouter CurUnoDialog.setFocus("lblContent"); } - class ItemListenerImpl implements com.sun.star.awt.XItemListener + private class ItemListenerImpl implements com.sun.star.awt.XItemListener { public void itemStateChanged(com.sun.star.awt.ItemEvent EventObject) @@ -302,7 +302,7 @@ public class ReportLayouter } } - class ActionListenerImpl implements com.sun.star.awt.XActionListener + private class ActionListenerImpl implements com.sun.star.awt.XActionListener { public void disposing(EventObject eventObject) diff --git a/wizards/com/sun/star/wizards/report/ReportWizard.java b/wizards/com/sun/star/wizards/report/ReportWizard.java index b9de1d542545..3798bba8637e 100644 --- a/wizards/com/sun/star/wizards/report/ReportWizard.java +++ b/wizards/com/sun/star/wizards/report/ReportWizard.java @@ -645,7 +645,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener super.setStepEnabled(SOSORTPAGE, bdoenable); } - public class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener + private class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener { private int m_nID; diff --git a/wizards/com/sun/star/wizards/table/CallTableWizard.java b/wizards/com/sun/star/wizards/table/CallTableWizard.java index aa1fb214a6b1..b7693a102f34 100644 --- a/wizards/com/sun/star/wizards/table/CallTableWizard.java +++ b/wizards/com/sun/star/wizards/table/CallTableWizard.java @@ -52,7 +52,7 @@ public class CallTableWizard /** This class implements the component. At least the interfaces XServiceInfo, * XTypeProvider, and XInitialization should be provided by the service. */ - public static class TableWizardImplementation extends com.sun.star.lib.uno.helper.PropertySet implements com.sun.star.lang.XInitialization, com.sun.star.lang.XServiceInfo, com.sun.star.task.XJobExecutor + private static class TableWizardImplementation extends com.sun.star.lib.uno.helper.PropertySet implements com.sun.star.lang.XInitialization, com.sun.star.lang.XServiceInfo, com.sun.star.task.XJobExecutor { private PropertyValue[] m_wizardContext; diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java index 9261ee7cc9b0..6b78a39d01c2 100644 --- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java +++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java @@ -159,7 +159,7 @@ public class AggregateComponent extends ControlScroller } } - class ActionListenerImpl implements com.sun.star.awt.XActionListener + private class ActionListenerImpl implements com.sun.star.awt.XActionListener { public void disposing(EventObject eventObject) @@ -507,7 +507,7 @@ public class AggregateComponent extends ControlScroller } } - protected class ControlRow + private class ControlRow { private XListBox xFieldListBox; @@ -570,7 +570,7 @@ public class AggregateComponent extends ControlScroller UnoDialog.deselectListBox(xFunctionListBox); } - protected class ItemListenerImpl implements com.sun.star.awt.XItemListener + private class ItemListenerImpl implements com.sun.star.awt.XItemListener { public void itemStateChanged(com.sun.star.awt.ItemEvent EventObject) diff --git a/wizards/com/sun/star/wizards/ui/ButtonList.java b/wizards/com/sun/star/wizards/ui/ButtonList.java index bfe0d3e93688..f15f7d26e4ba 100644 --- a/wizards/com/sun/star/wizards/ui/ButtonList.java +++ b/wizards/com/sun/star/wizards/ui/ButtonList.java @@ -619,7 +619,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener } } - public static class Counter + private static class Counter { private int start, end, max; diff --git a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java index 80656adc9655..2bb9d607d536 100644 --- a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java @@ -44,7 +44,7 @@ public class CommandFieldSelection extends FieldSelection implements Comparator< private WizardDialog oWizardDialog; private Collator aCollator = null; - class ItemListenerImpl implements com.sun.star.awt.XItemListener + private class ItemListenerImpl implements com.sun.star.awt.XItemListener { public void itemStateChanged(com.sun.star.awt.ItemEvent EventObject) diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java b/wizards/com/sun/star/wizards/ui/ControlScroller.java index 179d787bf391..46ffd48cbdd9 100644 --- a/wizards/com/sun/star/wizards/ui/ControlScroller.java +++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java @@ -56,7 +56,7 @@ public abstract class ControlScroller protected ArrayList<Object> ControlGroupVector = new ArrayList<Object>(); protected PeerConfig oTitlePeerConfig; - class AdjustmentListenerImpl implements com.sun.star.awt.XAdjustmentListener + private class AdjustmentListenerImpl implements com.sun.star.awt.XAdjustmentListener { public void disposing(com.sun.star.lang.EventObject eventObject) diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java b/wizards/com/sun/star/wizards/ui/FieldSelection.java index 3b0a4c6ee188..fd2ba4bd17c1 100644 --- a/wizards/com/sun/star/wizards/ui/FieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java @@ -59,7 +59,7 @@ public class FieldSelection private final static int SOSELFLDSLST = 8; - class ItemListenerImpl implements com.sun.star.awt.XItemListener + private class ItemListenerImpl implements com.sun.star.awt.XItemListener { public void itemStateChanged(com.sun.star.awt.ItemEvent EventObject) @@ -87,7 +87,7 @@ public class FieldSelection } } - class ActionListenerImpl implements com.sun.star.awt.XActionListener + private class ActionListenerImpl implements com.sun.star.awt.XActionListener { public void disposing(com.sun.star.lang.EventObject eventObject) diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java index 6f5d8358d281..364d304cd410 100644 --- a/wizards/com/sun/star/wizards/ui/FilterComponent.java +++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java @@ -112,7 +112,7 @@ public class FilterComponent private int SOI_MATCHANY = 1; private int curHelpID; - class ItemListenerImpl implements com.sun.star.awt.XItemListener + private class ItemListenerImpl implements com.sun.star.awt.XItemListener { public void itemStateChanged(com.sun.star.awt.ItemEvent EventObject) @@ -167,7 +167,7 @@ public class FilterComponent } } - class TextListenerImpl implements com.sun.star.awt.XTextListener + private class TextListenerImpl implements com.sun.star.awt.XTextListener { public void textChanged(TextEvent EventObject) @@ -508,7 +508,7 @@ public class FilterComponent - final class ControlRow + private final class ControlRow { private final static int SOLSTFIELDNAME = 3; diff --git a/wizards/com/sun/star/wizards/ui/ImageList.java b/wizards/com/sun/star/wizards/ui/ImageList.java index 673bc64c4d96..011c9ecce72a 100644 --- a/wizards/com/sun/star/wizards/ui/ImageList.java +++ b/wizards/com/sun/star/wizards/ui/ImageList.java @@ -99,7 +99,7 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener this.imageSize = imageSize; } - class OMouseListener implements XMouseListener + private class OMouseListener implements XMouseListener { public OMouseListener() {} @@ -808,7 +808,7 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener } } - public static class Counter + private static class Counter { private int start, end, max; diff --git a/wizards/com/sun/star/wizards/ui/PathSelection.java b/wizards/com/sun/star/wizards/ui/PathSelection.java index 7ccf5f7b24c1..e3b14186d3f4 100644 --- a/wizards/com/sun/star/wizards/ui/PathSelection.java +++ b/wizards/com/sun/star/wizards/ui/PathSelection.java @@ -38,14 +38,14 @@ public class PathSelection public XPathSelectionListener xAction; public XTextComponent xSaveTextBox; - public static class DialogTypes + private static class DialogTypes { private static final int FOLDER = 0; private static final int FILE = 1; } - public static class TransferMode + private static class TransferMode { private static final int SAVE = 0; diff --git a/wizards/com/sun/star/wizards/ui/PeerConfig.java b/wizards/com/sun/star/wizards/ui/PeerConfig.java index b836221851f6..89a10f04f5ce 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 class PeerTask { private XControl xControl; @@ -58,7 +58,7 @@ public class PeerConfig implements XWindowListener } } - class ControlTask + private class ControlTask { private Object oModel; @@ -73,7 +73,7 @@ public class PeerConfig implements XWindowListener } } - class ImageUrlTask + private class ImageUrlTask { private Object oModel; diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java b/wizards/com/sun/star/wizards/ui/SortingComponent.java index b8d7237d864b..b6f00a0e3f54 100644 --- a/wizards/com/sun/star/wizards/ui/SortingComponent.java +++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java @@ -47,7 +47,7 @@ public class SortingComponent }; private XListBox[] xSortListBox = new XListBox[4]; - class ItemListenerImpl implements com.sun.star.awt.XItemListener + private class ItemListenerImpl implements com.sun.star.awt.XItemListener { public void itemStateChanged(ItemEvent EventObject) diff --git a/wizards/com/sun/star/wizards/ui/TitlesComponent.java b/wizards/com/sun/star/wizards/ui/TitlesComponent.java index 2e15ebabafe4..0b379f1ec637 100644 --- a/wizards/com/sun/star/wizards/ui/TitlesComponent.java +++ b/wizards/com/sun/star/wizards/ui/TitlesComponent.java @@ -86,7 +86,7 @@ public class TitlesComponent extends ControlScroller } } - class ControlRow + private class ControlRow { PropertyValue[] regproperties; |