Use JDT static inner class clean up for test plug-ins
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: Id725f501f87f64e5b9f7c7f4929e3a688fa9ad0e
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ui/+/180221
Tested-by: Platform Bot <platform-bot@eclipse.org>
Reviewed-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CSSSWTWidgetTest.java b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CSSSWTWidgetTest.java
index 98465e8..cac9163 100644
--- a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CSSSWTWidgetTest.java
+++ b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CSSSWTWidgetTest.java
@@ -34,7 +34,7 @@
- private final class WidgetElementWithSupplierReturningNull extends WidgetElement {
+ private static final class WidgetElementWithSupplierReturningNull extends WidgetElement {
private WidgetElementWithSupplierReturningNull(Widget widget, CSSEngine engine) {
super(widget, engine);
}
diff --git a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/InnerClassElementTest.java b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/InnerClassElementTest.java
index 44520db..1a78702 100644
--- a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/InnerClassElementTest.java
+++ b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/InnerClassElementTest.java
@@ -28,7 +28,7 @@
// create an inner class to address via CSS
- class CustomComposite extends Composite {
+ static class CustomComposite extends Composite {
public CustomComposite(Composite parent, int style) {
super(parent, style);
}
diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/application/EPartServiceTest.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/application/EPartServiceTest.java
index b661ba4..e2ade99 100644
--- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/application/EPartServiceTest.java
+++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/application/EPartServiceTest.java
@@ -9982,7 +9982,7 @@
});
}
- class PartListener implements IPartListener {
+ static class PartListener implements IPartListener {
private List<MPart> activatedParts = new ArrayList<>();
private List<MPart> deactivatedParts = new ArrayList<>();
@@ -10099,7 +10099,7 @@
}
- class ExceptionListener implements IPartListener {
+ static class ExceptionListener implements IPartListener {
@Override
public void partActivated(MPart part) {
diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/application/UIEventsTest.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/application/UIEventsTest.java
index 8fe1d0b..5678f64 100644
--- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/application/UIEventsTest.java
+++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/application/UIEventsTest.java
@@ -50,7 +50,7 @@
public class UIEventsTest extends HeadlessApplicationElementTest {
- class EventTester {
+ static class EventTester {
String testerName;
IEventBroker eventBroker;
String topic;
@@ -119,7 +119,7 @@
}
}
- public class AppElementTester extends EventTester {
+ public static class AppElementTester extends EventTester {
AppElementTester(IEventBroker eventBroker) {
super("AppElement", ApplicationElement.TOPIC_ALL, new String[] {
ApplicationElement.ELEMENTID, ApplicationElement.TAGS,
@@ -127,21 +127,21 @@
}
}
- public class CommandTester extends EventTester {
+ public static class CommandTester extends EventTester {
CommandTester(IEventBroker eventBroker) {
super("Command", Command.TOPIC_ALL,
new String[] { Command.COMMANDNAME }, eventBroker);
}
}
- public class ContextTester extends EventTester {
+ public static class ContextTester extends EventTester {
ContextTester(IEventBroker eventBroker) {
super("Context", Context.TOPIC_ALL, new String[] { Context.CONTEXT,
Context.VARIABLES }, eventBroker);
}
}
- public class ContributionTester extends EventTester {
+ public static class ContributionTester extends EventTester {
ContributionTester(IEventBroker eventBroker) {
super("Contribution", Contribution.TOPIC_ALL, new String[] {
Contribution.CONTRIBUTIONURI, Contribution.OBJECT },
@@ -149,7 +149,7 @@
}
}
- public class ElementContainerTester extends EventTester {
+ public static class ElementContainerTester extends EventTester {
ElementContainerTester(IEventBroker eventBroker) {
super("ElementContainer", ElementContainer.TOPIC_ALL,
new String[] { ElementContainer.CHILDREN,
@@ -157,21 +157,21 @@
}
}
- public class DirtyableTester extends EventTester {
+ public static class DirtyableTester extends EventTester {
DirtyableTester(IEventBroker eventBroker) {
super("Dirtyable", Dirtyable.TOPIC_ALL,
new String[] { Dirtyable.DIRTY }, eventBroker);
}
}
- public class ParameterTester extends EventTester {
+ public static class ParameterTester extends EventTester {
ParameterTester(IEventBroker eventBroker) {
super("Parameter", Parameter.TOPIC_ALL, new String[] {
Parameter.NAME, Parameter.VALUE }, eventBroker);
}
}
- public class UIElementTester extends EventTester {
+ public static class UIElementTester extends EventTester {
UIElementTester(IEventBroker eventBroker) {
super("UIElement", UIElement.TOPIC_ALL, new String[] {
UIElement.RENDERER, UIElement.TOBERENDERED,
@@ -180,14 +180,14 @@
}
}
- public class UIItemTester extends EventTester {
+ public static class UIItemTester extends EventTester {
UIItemTester(IEventBroker eventBroker) {
super("UIItem", UILabel.TOPIC_ALL, new String[] { UILabel.LABEL,
UILabel.ICONURI, UILabel.TOOLTIP }, eventBroker);
}
}
- public class WindowTester extends EventTester {
+ public static class WindowTester extends EventTester {
WindowTester(IEventBroker eventBroker) {
super("Window", Window.TOPIC_ALL, new String[] { Window.MAINMENU,
Window.X, Window.Y, Window.WIDTH, Window.HEIGHT },
diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/TabStateHandlerTest.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/TabStateHandlerTest.java
index afe9b9d..674f3e4 100644
--- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/TabStateHandlerTest.java
+++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/TabStateHandlerTest.java
@@ -281,7 +281,7 @@
});
}
- private class EventParam implements Map.Entry<String, Object> {
+ private static class EventParam implements Map.Entry<String, Object> {
private String key;
private Object value;
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/ListDiffTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/ListDiffTest.java
index c5ed753..2a25431 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/ListDiffTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/ListDiffTest.java
@@ -148,7 +148,7 @@
return Diffs.createListDiff(differences);
}
- class ListDiffVisitorStub extends ListDiffVisitor<Object> {
+ static class ListDiffVisitorStub extends ListDiffVisitor<Object> {
String log = "";
@Override
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableValueTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableValueTest.java
index 1729a87..69c0716 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableValueTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableValueTest.java
@@ -223,7 +223,7 @@
*
* @since 3.2
*/
- /* package */class ThrowsSetException {
+ static /* package */class ThrowsSetException {
private String value;
/* package */NullPointerException thrownException;
@@ -237,7 +237,7 @@
}
}
- /* package */class ThrowsGetException {
+ /* package */static class ThrowsGetException {
public String value;
/* package */NullPointerException thrownException;
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/examples/model/PersonTests.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/examples/model/PersonTests.java
index e2997c2..fbaac83 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/examples/model/PersonTests.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/examples/model/PersonTests.java
@@ -47,7 +47,7 @@
assertEquals("new state", person.getState());
}
- private class Listener implements PropertyChangeListener {
+ private static class Listener implements PropertyChangeListener {
private int count;
private PropertyChangeEvent lastEvent;
diff --git a/tests/org.eclipse.ui.ide.application.tests/src/org/eclipse/ui/internal/ide/application/dialogs/UriSchemeHandlerPreferencePageTest.java b/tests/org.eclipse.ui.ide.application.tests/src/org/eclipse/ui/internal/ide/application/dialogs/UriSchemeHandlerPreferencePageTest.java
index 07700c8..fd8b88f 100644
--- a/tests/org.eclipse.ui.ide.application.tests/src/org/eclipse/ui/internal/ide/application/dialogs/UriSchemeHandlerPreferencePageTest.java
+++ b/tests/org.eclipse.ui.ide.application.tests/src/org/eclipse/ui/internal/ide/application/dialogs/UriSchemeHandlerPreferencePageTest.java
@@ -399,7 +399,7 @@
return new ExtensionReaderStub(Arrays.asList(noAppScheme, thisAppScheme, otherAppScheme));
}
- private final class StatusManagerWrapperSpy implements IStatusManagerWrapper {
+ private static final class StatusManagerWrapperSpy implements IStatusManagerWrapper {
public IStatus handledStatus;
public int style;
@@ -410,7 +410,7 @@
}
}
- private final class MessageDialogWrapperSpy implements IMessageDialogWrapper {
+ private static final class MessageDialogWrapperSpy implements IMessageDialogWrapper {
public String title;
public String message;
@@ -430,7 +430,7 @@
}
}
- private final class ExtensionReaderStub implements IUriSchemeExtensionReader {
+ private static final class ExtensionReaderStub implements IUriSchemeExtensionReader {
public Collection<IScheme> schemes;
public ExtensionReaderStub(Collection<IScheme> schemes) {
@@ -448,7 +448,7 @@
}
}
- private class SchemeStub implements IScheme {
+ private static class SchemeStub implements IScheme {
private String name;
private String description;
@@ -470,7 +470,7 @@
}
}
- private class SchemeInformationStub implements ISchemeInformation {
+ private static class SchemeInformationStub implements ISchemeInformation {
private IScheme scheme;
private boolean handled;
@@ -503,7 +503,7 @@
}
}
- private final class OperatingSystemRegistrationMock implements IOperatingSystemRegistration {
+ private static final class OperatingSystemRegistrationMock implements IOperatingSystemRegistration {
private List<ISchemeInformation> schemeInformations;
public Exception schemeInformationReadException = null;
@@ -546,7 +546,7 @@
}
- private class IOExceptionWithoutStackTrace extends IOException {
+ private static class IOExceptionWithoutStackTrace extends IOException {
private static final long serialVersionUID = 1L;
diff --git a/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/widgets/ExpandableCompositeTest.java b/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/widgets/ExpandableCompositeTest.java
index 218cdd4..eeb774a 100644
--- a/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/widgets/ExpandableCompositeTest.java
+++ b/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/widgets/ExpandableCompositeTest.java
@@ -59,7 +59,7 @@
// change this to true if you want to see test is slow motion
private boolean humanWatching = false;
- private class ExpandableCompositeForTest extends ExpandableComposite {
+ private static class ExpandableCompositeForTest extends ExpandableComposite {
private Control separator;
private Control description;
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestSimpleChildrenContentProvider.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestSimpleChildrenContentProvider.java
index c68960b..04aa1d6 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestSimpleChildrenContentProvider.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestSimpleChildrenContentProvider.java
@@ -31,7 +31,7 @@
private Object[] _children;
- public class SimpleChild {
+ public static class SimpleChild {
public String _name;
public Object _parent;
diff --git a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/LabelProviderTest.java b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/LabelProviderTest.java
index edfbb3a..aafcc83 100644
--- a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/LabelProviderTest.java
+++ b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/LabelProviderTest.java
@@ -57,7 +57,7 @@
@RunWith(Parameterized.class)
public class LabelProviderTest extends BasicPerformanceTest {
- private class CountryEntry {
+ private static class CountryEntry {
private String name;
private String cupYear;
private String baseName;
@@ -109,7 +109,7 @@
}
}
- private class TestCellLabelProvider extends CellLabelProvider implements IStyledLabelProvider, IFontProvider {
+ private static class TestCellLabelProvider extends CellLabelProvider implements IStyledLabelProvider, IFontProvider {
private boolean useColor;
@@ -291,7 +291,7 @@
return new TestLabelDecorator();
}
- private class TestLabelDecorator implements ILabelDecorator, IColorDecorator {
+ private static class TestLabelDecorator implements ILabelDecorator, IColorDecorator {
@Override
public Image decorateImage(Image image, Object element) {
diff --git a/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/dynamic/views/DynamicTestsView.java b/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/dynamic/views/DynamicTestsView.java
index ceed21b..c472306 100644
--- a/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/dynamic/views/DynamicTestsView.java
+++ b/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/dynamic/views/DynamicTestsView.java
@@ -44,7 +44,7 @@
public class DynamicTestsView extends ViewPart implements
ITabbedPropertySheetPageContributor {
- class DynamicTestsViewLabelProvider extends LabelProvider {
+ static class DynamicTestsViewLabelProvider extends LabelProvider {
@Override
public Image getImage(Object obj) {
diff --git a/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/views/TestsView.java b/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/views/TestsView.java
index 1b32512..4be8da2 100644
--- a/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/views/TestsView.java
+++ b/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/views/TestsView.java
@@ -35,7 +35,7 @@
public static final String TESTS_VIEW_ID = "org.eclipse.ui.tests.views.properties.tabbed.views.TestsView"; //$NON-NLS-1$
- class ViewLabelProvider
+ static class ViewLabelProvider
extends LabelProvider {
@Override
