diff options
author | Lars Vogel | 2021-07-21 13:36:20 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2021-07-21 13:55:25 +0000 |
commit | 5143924c24f9fe9c69fdf72fa1a0ac14c895ddf0 (patch) | |
tree | 3546f76be1a6ba0876d7f5a61ad8ad1238bec264 | |
parent | 5d074b295f483924811b6e11a39600f0b76b0034 (diff) | |
download | eclipse.platform.debug-5143924c24f9fe9c69fdf72fa1a0ac14c895ddf0.tar.gz eclipse.platform.debug-5143924c24f9fe9c69fdf72fa1a0ac14c895ddf0.tar.xz eclipse.platform.debug-5143924c24f9fe9c69fdf72fa1a0ac14c895ddf0.zip |
Use JDT static inner class clean up for platform.debug internal packagesY20210810-0820Y20210810-0500Y20210805-0800Y20210804-1030Y20210730-0530Y20210729-0800Y20210727-0800Y20210722-0800I20210811-1800I20210810-1800I20210809-1800I20210808-1800I20210807-1800I20210806-1800I20210805-1800I20210804-1800I20210804-0930I20210730-1800I20210729-1800I20210729-0050I20210728-1800I20210727-1800I20210726-1800I20210725-1800I20210724-1800I20210723-1800I20210722-1800I20210721-1800
This ticket uses and tests the "Use static inner class" cleanup feature:
- It reviews the feature
- It reduces the memory consumption as it avoids the pointer to the
outer class
Example:
Before:
public class Outer {
public class InnerClass {
int i;
public boolean anotherMethod() {
return true;
}
}
}
After:
public class Outer {
public static class InnerClass {
int i;
public boolean anotherMethod() {
return true;
}
}
}
Change-Id: Id13e31a83bc9a0740a17b1d409aebc613bcbdb7f
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.debug/+/180223
Tested-by: Platform Bot <platform-bot@eclipse.org>
Reviewed-by: Alexander Kurtakov <akurtako@redhat.com>
41 files changed, 52 insertions, 52 deletions
diff --git a/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/model/ExternalToolBuilder.java b/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/model/ExternalToolBuilder.java index 16ac512a8..ee9b49517 100644 --- a/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/model/ExternalToolBuilder.java +++ b/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/model/ExternalToolBuilder.java @@ -43,7 +43,7 @@ import org.osgi.framework.Bundle; * build process. */ public final class ExternalToolBuilder extends IncrementalProjectBuilder { - private final class IgnoreTeamPrivateChanges implements IResourceDeltaVisitor { + private static final class IgnoreTeamPrivateChanges implements IResourceDeltaVisitor { private boolean[] fTrueChange; private IgnoreTeamPrivateChanges(boolean[] trueChange) { super(); diff --git a/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringSubstitutionEngine.java b/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringSubstitutionEngine.java index 77fb387d8..cd413883b 100644 --- a/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringSubstitutionEngine.java +++ b/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringSubstitutionEngine.java @@ -56,7 +56,7 @@ public class StringSubstitutionEngine { */ private Deque<VariableReference> fStack; - class VariableReference { + static class VariableReference { // the text inside the variable reference private StringBuilder fText; diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java index ae1f02c32..8725666b5 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java @@ -194,7 +194,7 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis * * @since 3.5 */ - class DefaultImportParticipant implements IBreakpointImportParticipant { + static class DefaultImportParticipant implements IBreakpointImportParticipant { @Override public boolean matches(Map<String, Object> attributes, IBreakpoint breakpoint) throws CoreException { diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java index fb9c0c749..d4689d0a6 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java @@ -442,7 +442,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe * Collects files whose extension matches the launch configuration file * extension. */ - class ResourceProxyVisitor implements IResourceProxyVisitor { + static class ResourceProxyVisitor implements IResourceProxyVisitor { private List<IResource> fList; @@ -467,7 +467,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe * * @since 3.3 */ - class PreferredDelegate { + static class PreferredDelegate { private ILaunchDelegate fDelegate = null; private String fTypeid = null; private Set<String> fModes = null; diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/NullStreamsProxy.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/NullStreamsProxy.java index 494a9c297..a7ce39e00 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/NullStreamsProxy.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/NullStreamsProxy.java @@ -64,7 +64,7 @@ public class NullStreamsProxy implements IBinaryStreamsProxy { public void write(byte[] data, int offset, int length) throws IOException { } - private class NullStreamMonitor implements IBinaryStreamMonitor { + private static class NullStreamMonitor implements IBinaryStreamMonitor { private InputStream fStream; public NullStreamMonitor(InputStream stream) { diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/PreferredDelegateModifyListener.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/PreferredDelegateModifyListener.java index fcba9059d..313392498 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/PreferredDelegateModifyListener.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/PreferredDelegateModifyListener.java @@ -27,7 +27,7 @@ import org.osgi.service.prefs.BackingStoreException; * @since 3.6 TODO can we roll this into general preference listening? */ public class PreferredDelegateModifyListener extends PreferenceModifyListener { - class Visitor implements IPreferenceNodeVisitor { + static class Visitor implements IPreferenceNodeVisitor { @Override public boolean visit(IEclipsePreferences node) throws BackingStoreException { diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAVirtualFindAction.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAVirtualFindAction.java index 3e002de85..37d115b47 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAVirtualFindAction.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAVirtualFindAction.java @@ -67,7 +67,7 @@ public class PDAVirtualFindAction extends Action implements IUpdate { private final TreeModelViewer fClientViewer; - protected class VirtualViewerListener implements IViewerUpdateListener, ILabelUpdateListener { + protected static class VirtualViewerListener implements IViewerUpdateListener, ILabelUpdateListener { private boolean fViewerUpdatesComplete = false; private boolean fLabelUpdatesComplete = false; diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAScanner.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAScanner.java index aa586afe5..4de0f7c77 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAScanner.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAScanner.java @@ -39,7 +39,7 @@ public class PDAScanner extends BufferedRuleBasedScanner { /** * Detects potential keywords */ - class PDAWordDetector implements IWordDetector { + static class PDAWordDetector implements IWordDetector { @Override public boolean isWordStart(char c) { diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/expressions/ExpressionManagerTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/expressions/ExpressionManagerTests.java index 616325342..64eb0fe5b 100644 --- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/expressions/ExpressionManagerTests.java +++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/expressions/ExpressionManagerTests.java @@ -37,7 +37,7 @@ import org.junit.Test; */ public class ExpressionManagerTests extends AbstractDebugTest { - class SinlgeListener implements IExpressionListener { + static class SinlgeListener implements IExpressionListener { List<IExpression> added = new ArrayList<>(); List<IExpression> removed = new ArrayList<>(); @@ -66,7 +66,7 @@ public class ExpressionManagerTests extends AbstractDebugTest { } - class MultiListener implements IExpressionsListener { + static class MultiListener implements IExpressionsListener { List<IExpression> added = new ArrayList<>(); List<IExpression> removed = new ArrayList<>(); @@ -95,7 +95,7 @@ public class ExpressionManagerTests extends AbstractDebugTest { } - class InsertMoveListener extends MultiListener implements IExpressionsListener2 { + static class InsertMoveListener extends MultiListener implements IExpressionsListener2 { List<IExpression> moved = new ArrayList<>(); List<IExpression> inserted = new ArrayList<>(); diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchConfigurationTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchConfigurationTests.java index 4c5b200ac..26e101ca5 100644 --- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchConfigurationTests.java +++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchConfigurationTests.java @@ -101,7 +101,7 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau * Class to hold resource description infos * @since 3.9.0 */ - class ResourceItem { + static class ResourceItem { public ResourceItem(String path, Integer type) { this.path = path; this.type = type; @@ -110,7 +110,7 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau Integer type; } - class Listener implements ILaunchConfigurationListener { + static class Listener implements ILaunchConfigurationListener { private final List<ILaunchConfiguration> addedList = new ArrayList<>(); private final List<ILaunchConfiguration> removedList = new ArrayList<>(); diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ColumnPresentationTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ColumnPresentationTests.java index 7654bf633..1ac5939dc 100644 --- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ColumnPresentationTests.java +++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ColumnPresentationTests.java @@ -213,7 +213,7 @@ public class ColumnPresentationTests extends AbstractDebugTest implements ITestM } } - class MyModel extends TestModel implements IColumnPresentationFactory { + static class MyModel extends TestModel implements IColumnPresentationFactory { MyColumnPresentation colPresenation; MyModel(MyColumnPresentation cp1) { diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ContentTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ContentTests.java index 0c844d458..0bd96f04f 100644 --- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ContentTests.java +++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ContentTests.java @@ -95,7 +95,7 @@ abstract public class ContentTests extends AbstractViewerModelTest implements IT * Modified test model that optionally captures (i.e. doesn't compete) * udpates after filling in their data. */ - class TestModelWithCapturedUpdates extends TestModel { + static class TestModelWithCapturedUpdates extends TestModel { boolean fCaptureLabelUpdates = false; boolean fCaptureChildrenUpdates = false; diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/FilterTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/FilterTests.java index 1f003ab74..d4347804f 100644 --- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/FilterTests.java +++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/FilterTests.java @@ -49,7 +49,7 @@ abstract public class FilterTests extends AbstractViewerModelTest implements ITe return fViewer; } - class TestViewerFilter extends ViewerFilter { + static class TestViewerFilter extends ViewerFilter { Pattern fPattern; TestViewerFilter(String pattern) { @@ -68,7 +68,7 @@ abstract public class FilterTests extends AbstractViewerModelTest implements ITe } } - class TestTMVFilter extends TreeModelViewerFilter { + static class TestTMVFilter extends TreeModelViewerFilter { Pattern fPattern; Object fParentElement; TestTMVFilter(String pattern, Object parentElement) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/MultipleInputDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/MultipleInputDialog.java index 5e3092622..e3fd25878 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/MultipleInputDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/MultipleInputDialog.java @@ -365,7 +365,7 @@ public class MultipleInputDialog extends Dialog { getButton(IDialogConstants.OK_ID).setEnabled(true); } - protected class FieldSummary { + protected static class FieldSummary { int type; String name; String initialValue; @@ -379,7 +379,7 @@ public class MultipleInputDialog extends Dialog { } } - protected class Validator { + protected static class Validator { boolean validate() { return true; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ConfigureColumnsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ConfigureColumnsAction.java index c2c58f5f0..5157a0079 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ConfigureColumnsAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ConfigureColumnsAction.java @@ -43,7 +43,7 @@ public class ConfigureColumnsAction extends Action implements IUpdate { private TreeModelViewer fViewer; - class ColumnContentProvider implements IStructuredContentProvider { + static class ColumnContentProvider implements IStructuredContentProvider { @Override public Object[] getElements(Object inputElement) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/CommonTabLite.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/CommonTabLite.java index d6ce28a47..fdcfb1dc7 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/CommonTabLite.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/CommonTabLite.java @@ -509,7 +509,7 @@ class CommonTabLite extends AbstractLaunchConfigurationTab { * Provides the labels for the favorites table * */ - class FavoritesLabelProvider implements ITableLabelProvider { + static class FavoritesLabelProvider implements ITableLabelProvider { private Map<Object, Image> fImages = new HashMap<>(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationManager.java index ec0934c17..b2f01fdaf 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationManager.java @@ -102,7 +102,7 @@ public class LaunchConfigurationManager implements ILaunchListener, ISavePartici * A comparator for the ordering of launch shortcut extensions * @since 3.3 */ - class ShortcutComparator implements Comparator<LaunchShortcutExtension> { + static class ShortcutComparator implements Comparator<LaunchShortcutExtension> { /** * @see Comparator#compare(Object, Object) */ diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupWrapper.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupWrapper.java index f45c6287d..f2f9e11f0 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupWrapper.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupWrapper.java @@ -45,7 +45,7 @@ public class LaunchConfigurationTabGroupWrapper implements ILaunchConfigurationT * * @since 3.5 */ - class TabCollector implements Iterator<ILaunchConfigurationTab> { + static class TabCollector implements Iterator<ILaunchConfigurationTab> { private HashSet<String> idSet = null; private ArrayList<ILaunchConfigurationTab> tabList = null; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutExtension.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutExtension.java index 7a48f5cc2..140647c47 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutExtension.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutExtension.java @@ -67,7 +67,7 @@ public class LaunchShortcutExtension implements ILaunchShortcut2, IPluginContrib /** * Command handler for launch shortcut key binding. */ - private class LaunchCommandHandler extends AbstractHandler { + private static class LaunchCommandHandler extends AbstractHandler { // the shortcut to invoke private LaunchShortcutExtension fShortcut; private String fMode; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectLaunchModesDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectLaunchModesDialog.java index 37b0b4a35..ed6bab9a7 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectLaunchModesDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectLaunchModesDialog.java @@ -43,7 +43,7 @@ public class SelectLaunchModesDialog extends AbstractDebugListSelectionDialog{ /** * Builds labels for list control */ - class OptionsLabelProvider implements ILabelProvider { + static class OptionsLabelProvider implements ILabelProvider { @Override public Image getImage(Object element) {return null;} @Override diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTableRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTableRendering.java index e7da67f94..f91ff538f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTableRendering.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTableRendering.java @@ -337,7 +337,7 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende } } - private class SerialByObjectRule implements ISchedulingRule { + private static class SerialByObjectRule implements ISchedulingRule { private Object fObject = null; public SerialByObjectRule(Object lock) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchPerspectivePreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchPerspectivePreferencePage.java index c6055fad0..2fc1bb843 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchPerspectivePreferencePage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchPerspectivePreferencePage.java @@ -127,7 +127,7 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I /** * Provides content for the configuration tree viewer */ - final class PerspectiveContentProvider implements ITreeContentProvider { + static final class PerspectiveContentProvider implements ITreeContentProvider { @Override public Object[] getChildren(Object parentElement) { if(parentElement instanceof ILaunchConfigurationType) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchersPreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchersPreferencePage.java index a76918943..77f4c36c4 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchersPreferencePage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchersPreferencePage.java @@ -65,7 +65,7 @@ public class LaunchersPreferencePage extends PreferencePage implements IWorkbenc /** * Class to collect and persist attributes to sufficiently describe a duplicate launch delegate */ - class DuplicateDelegate { + static class DuplicateDelegate { private ILaunchConfigurationType fType = null; private ILaunchDelegate[] fDelegates = null; private Set<String> fModes = null; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/StringVariablePreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/StringVariablePreferencePage.java index b03ab1e77..b6a8adaac 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/StringVariablePreferencePage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/StringVariablePreferencePage.java @@ -564,7 +564,7 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor } - class VariableWrapper { + static class VariableWrapper { protected IValueVariable fVariable; protected String fNewName = null; @@ -722,7 +722,7 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor } } - class VariableFilter extends ViewerFilter { + static class VariableFilter extends ViewerFilter { @Override public boolean select(Viewer viewer, Object parentElement, Object element) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousModel.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousModel.java index fdb5cc03c..e09b9bfc7 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousModel.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousModel.java @@ -66,7 +66,7 @@ public abstract class AsynchronousModel { private AsynchronousViewer fViewer; // viewer this model works for private boolean fDisposed = false; // whether disposed - class EmptyContentAdapter extends AsynchronousContentAdapter { + static class EmptyContentAdapter extends AsynchronousContentAdapter { @Override protected Object[] getChildren(Object parent, IPresentationContext context) throws CoreException { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousSchedulingRuleFactory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousSchedulingRuleFactory.java index a9f1a0c4b..4f05e0bc8 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousSchedulingRuleFactory.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousSchedulingRuleFactory.java @@ -27,7 +27,7 @@ public class AsynchronousSchedulingRuleFactory { /** * Rule allows only one job to run at a time */ - class SerialRule implements ISchedulingRule { + static class SerialRule implements ISchedulingRule { public SerialRule() { } @@ -43,7 +43,7 @@ public class AsynchronousSchedulingRuleFactory { } } - class SerialPerObjectRule implements ISchedulingRule { + static class SerialPerObjectRule implements ISchedulingRule { private Object fObject = null; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousViewer.java index aba77c7ab..b287456c9 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousViewer.java @@ -643,7 +643,7 @@ public abstract class AsynchronousViewer extends StructuredViewer implements Lis /** * A content provider that does nothing. */ - private class NullContentProvider implements IStructuredContentProvider { + private static class NullContentProvider implements IStructuredContentProvider { @Override public void dispose() { } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualCopyToClipboardActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualCopyToClipboardActionDelegate.java index cab30d7f1..1c46d887f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualCopyToClipboardActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualCopyToClipboardActionDelegate.java @@ -171,7 +171,7 @@ public class VirtualCopyToClipboardActionDelegate extends AbstractDebugActionDel return label.trim(); } - private class ItemsToCopyVirtualItemValidator implements IVirtualItemValidator { + private static class ItemsToCopyVirtualItemValidator implements IVirtualItemValidator { Set<VirtualItem> fItemsToCopy = Collections.EMPTY_SET; Set<VirtualItem> fItemsToValidate = Collections.EMPTY_SET; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualFindAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualFindAction.java index f427d443a..af81638b5 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualFindAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualFindAction.java @@ -61,7 +61,7 @@ public class VirtualFindAction extends Action implements IUpdate { private TreeModelViewer fClientViewer; - private class VirtualViewerListener implements IViewerUpdateListener, ILabelUpdateListener { + private static class VirtualViewerListener implements IViewerUpdateListener, ILabelUpdateListener { private boolean fViewerUpdatesComplete = false; private boolean fLabelUpdatesComplete = false; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java index 472a894e0..061e47505 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java @@ -989,7 +989,7 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe } } - private class ConsoleLogFileHyperlink implements IHyperlink { + private static class ConsoleLogFileHyperlink implements IHyperlink { String fFilePath; ConsoleLogFileHyperlink(String filePath) { fFilePath = filePath; @@ -1024,7 +1024,7 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe } } - class StorageEditorInput extends PlatformObject implements IStorageEditorInput { + static class StorageEditorInput extends PlatformObject implements IStorageEditorInput { private File fFile; private IStorage fStorage; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java index 427955ba0..f7d159b83 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java @@ -112,7 +112,7 @@ public class AddMemoryRenderingDialog extends SelectionDialog { job.schedule(); }; - class MemoryRenderingLabelProvider implements ILabelProvider { + static class MemoryRenderingLabelProvider implements ILabelProvider { @Override public Image getImage(Object element) { @@ -147,7 +147,7 @@ public class AddMemoryRenderingDialog extends SelectionDialog { } - class MemoryRenderingContentProvider implements IStructuredContentProvider { + static class MemoryRenderingContentProvider implements IStructuredContentProvider { @Override public Object[] getElements(Object inputElement) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryView.java index 9f4b8a6d0..f0c7f7475 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryView.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryView.java @@ -124,7 +124,7 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 { private String fActivePaneId; - class MemoryViewSelectionProvider implements ISelectionProvider, ISelectionChangedListener { + static class MemoryViewSelectionProvider implements ISelectionProvider, ISelectionChangedListener { ArrayList<ISelectionChangedListener> fListeners = new ArrayList<>(); IStructuredSelection fSelections = new StructuredSelection(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewSynchronizationService.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewSynchronizationService.java index 9a5002d31..9abc831f2 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewSynchronizationService.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewSynchronizationService.java @@ -58,7 +58,7 @@ public class MemoryViewSynchronizationService implements IMemoryRenderingSynchro * Wrapper for ISynchronizedMemoryBlockView Holds a list of property filters * for the view. */ - class PropertyListener { + static class PropertyListener { IPropertyChangeListener fListener; String[] fFilters; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CreateRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CreateRendering.java index 5c2d85ba3..a2f01aee3 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CreateRendering.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CreateRendering.java @@ -78,7 +78,7 @@ public class CreateRendering extends AbstractMemoryRendering implements IMemoryR fContainer = container; } - class MemoryRenderingLabelProvider implements ILabelProvider + static class MemoryRenderingLabelProvider implements ILabelProvider { @Override @@ -116,7 +116,7 @@ public class CreateRendering extends AbstractMemoryRendering implements IMemoryR } - class MemoryRenderingContentProvider implements IStructuredContentProvider + static class MemoryRenderingContentProvider implements IStructuredContentProvider { @Override diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java index 8e59e6aa6..4dc79e2b0 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java @@ -340,7 +340,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis /** * Visits deltas to determine if details should be displayed */ - class Visitor implements IModelDeltaVisitor { + static class Visitor implements IModelDeltaVisitor { /** * Whether to trigger details display. * diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DetailPaneManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DetailPaneManager.java index 9eea45848..10cb57b4c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DetailPaneManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DetailPaneManager.java @@ -61,7 +61,7 @@ public class DetailPaneManager { * to the extension point. Only loads information from the plug-in xml and only * instantiates the specified factory if required (lazy loading). */ - private class DetailPaneFactoryExtension implements IDetailPaneFactory{ + private static class DetailPaneFactoryExtension implements IDetailPaneFactory{ private IConfigurationElement fConfigElement; private IDetailPaneFactory fFactory; diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePatternMatcher.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePatternMatcher.java index d6ca49bcf..c82ec6b6e 100644 --- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePatternMatcher.java +++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePatternMatcher.java @@ -179,7 +179,7 @@ public class ConsolePatternMatcher implements IDocumentListener { } - private class CompiledPatternMatchListener { + private static class CompiledPatternMatchListener { Pattern pattern; Pattern qualifier; diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuildTab.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuildTab.java index e9dfa46ee..efd514529 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuildTab.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuildTab.java @@ -79,7 +79,7 @@ public class ExternalToolsBuildTab extends AbstractLaunchConfigurationTab { // projects to build (empty if none) private List<IProject> fProjects = new ArrayList<>(); - class ProjectsContentProvider implements IStructuredContentProvider { + static class ProjectsContentProvider implements IStructuredContentProvider { @Override public Object[] getElements(Object inputElement) { diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsMainTab.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsMainTab.java index 8b8a8b438..0eab24c12 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsMainTab.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsMainTab.java @@ -626,7 +626,7 @@ public abstract class ExternalToolsMainTab extends AbstractLaunchConfigurationTa control.getAccessible().addAccessibleListener(new ControlAccessibleListener(stripped.toString())); } - private class ControlAccessibleListener extends AccessibleAdapter { + private static class ControlAccessibleListener extends AccessibleAdapter { private String controlName; ControlAccessibleListener(String name) { controlName = name; diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolsPlugin.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolsPlugin.java index 1e75be8a7..3d66b868e 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolsPlugin.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolsPlugin.java @@ -63,7 +63,7 @@ public final class ExternalToolsPlugin extends AbstractUIPlugin implements * A window listener that warns the user about any running programs when the * workbench closes. Programs are killed when the VM exits. */ - private class ProgramLaunchWindowListener implements IWindowListener { + private static class ProgramLaunchWindowListener implements IWindowListener { @Override public void windowActivated(IWorkbenchWindow window) { } diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java index 2bee78fc2..66f4b5419 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java @@ -116,7 +116,7 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta * Error configs are objects representing entries pointing to * invalid launch configurations */ - public class ErrorConfig { + public static class ErrorConfig { private ICommand command; public ErrorConfig(ICommand command) { this.command= command; |