[dogfooding][cleanup] Use static inner class clean up for
tests and examples
Using this cleanup brings:
- It reviews the feature
- For optimization: small memory usage reduction as the outer pointer
is removed
Change-Id: I0694e3be4c17ef7afa62f7222d2d0374b5d4afad
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ua/+/179069
Tested-by: Platform Bot <platform-bot@eclipse.org>
Reviewed-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/org.eclipse.tips.examples/src/org/eclipse/tips/examples/swttip/SwtTipImpl.java b/org.eclipse.tips.examples/src/org/eclipse/tips/examples/swttip/SwtTipImpl.java
index 5818735..022110f 100644
--- a/org.eclipse.tips.examples/src/org/eclipse/tips/examples/swttip/SwtTipImpl.java
+++ b/org.eclipse.tips.examples/src/org/eclipse/tips/examples/swttip/SwtTipImpl.java
@@ -31,7 +31,7 @@
public class SwtTipImpl extends Tip implements ISwtTip {
- private final class Beeper extends SelectionAdapter {
+ private static final class Beeper extends SelectionAdapter {
@Override
public void widgetSelected(SelectionEvent e) {
e.widget.getDisplay().beep();
diff --git a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/linkchecker/TocLinkChecker.java b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/linkchecker/TocLinkChecker.java
index b00667f..271a81c 100644
--- a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/linkchecker/TocLinkChecker.java
+++ b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/linkchecker/TocLinkChecker.java
@@ -38,28 +38,28 @@
public class TocLinkChecker {
- private final class ReferenceFilter extends TocValidator.Filter {
+ private static final class ReferenceFilter extends TocValidator.Filter {
@Override
public boolean isIncluded(String href) {
return href.startsWith("reference");
}
}
- private final class NonReferenceFilter extends TocValidator.Filter {
+ private static final class NonReferenceFilter extends TocValidator.Filter {
@Override
public boolean isIncluded(String href) {
return !href.startsWith("reference");
}
}
- private final class NonReferenceNonSampleFilter extends TocValidator.Filter {
+ private static final class NonReferenceNonSampleFilter extends TocValidator.Filter {
@Override
public boolean isIncluded(String href) {
return !href.startsWith("reference") && !href.startsWith("samples");
}
}
- private final class ReferenceOrSampleFilter extends TocValidator.Filter {
+ private static final class ReferenceOrSampleFilter extends TocValidator.Filter {
@Override
public boolean isIncluded(String href) {
return href.startsWith("reference") || href.startsWith("samples");
diff --git a/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/composite/TestTaskEvents.java b/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/composite/TestTaskEvents.java
index d319146..c11ce85 100644
--- a/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/composite/TestTaskEvents.java
+++ b/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/composite/TestTaskEvents.java
@@ -39,7 +39,7 @@
public class TestTaskEvents {
- public class TaskMap {
+ public static class TaskMap {
private Map<String, TaskCounter> map = new HashMap<>();
private int eventCount = 0;
@@ -68,7 +68,7 @@
}
}
- public class TaskCounter {
+ public static class TaskCounter {
private int count = 1;
public int getCount() {
diff --git a/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/other/TestStatePersistence.java b/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/other/TestStatePersistence.java
index e5089e4..d9440ba 100644
--- a/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/other/TestStatePersistence.java
+++ b/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/other/TestStatePersistence.java
@@ -43,7 +43,7 @@
private static final String TEST_ID = "TestId";
private static final String PATH = "ContentPath";
- private class PropertySet {
+ private static class PropertySet {
public String id;
public int currentItem;
public int button;
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/ConcurrentTocAccess.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/ConcurrentTocAccess.java
index b9f0bed..3998d00 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/ConcurrentTocAccess.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/ConcurrentTocAccess.java
@@ -31,7 +31,7 @@
// Set enableTimeout to false for debugging
private boolean enableTimeout = true;
- private class TocGenerator {
+ private static class TocGenerator {
private int[] dimensions;
private StringBuilder result;
@@ -91,10 +91,10 @@
}
}
- private class BadHrefException extends RuntimeException {
+ private static class BadHrefException extends RuntimeException {
private static final long serialVersionUID = 410319402417607912L;
}
- private class BadLabelException extends RuntimeException {
+ private static class BadLabelException extends RuntimeException {
private static final long serialVersionUID = -4581518572807575035L;
}
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/ContextLinkSorter.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/ContextLinkSorter.java
index 47952ac..2d006bf 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/ContextLinkSorter.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/ContextLinkSorter.java
@@ -23,7 +23,7 @@
public class ContextLinkSorter {
- private class TestResource implements IHelpResource {
+ private static class TestResource implements IHelpResource {
private String category;
private String href;
@@ -51,7 +51,7 @@
}
- private class TestContext implements IContext2 {
+ private static class TestContext implements IContext2 {
@Override
public String getCategory(IHelpResource topic) {
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/preferences/BookmarksTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/preferences/BookmarksTest.java
index d19f4a9..bda72d8 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/preferences/BookmarksTest.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/preferences/BookmarksTest.java
@@ -40,7 +40,7 @@
private static final String BUGZILLA = "bugzilla";
private static final String HTTP_BUGZILLA = "https://bugs.eclipse.org/bugs/";
- private class BookmarkObserver implements Observer {
+ private static class BookmarkObserver implements Observer {
public Object o;
public Object arg;
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/toc/EnabledTopicTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/toc/EnabledTopicTest.java
index 39de085..7a514fd 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/toc/EnabledTopicTest.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/toc/EnabledTopicTest.java
@@ -30,7 +30,7 @@
public class EnabledTopicTest {
- private class ETopic implements ITopic {
+ private static class ETopic implements ITopic {
private String label;
private boolean isEnabled;
@@ -72,7 +72,7 @@
}
}
- private class NoHrefTopic extends ETopic {
+ private static class NoHrefTopic extends ETopic {
public NoHrefTopic(String label) {
super(label, true);
@@ -85,7 +85,7 @@
}
- private class EIndexEntry extends UAElement implements IIndexEntry {
+ private static class EIndexEntry extends UAElement implements IIndexEntry {
private String keyword;
private List<ITopic> topics = new ArrayList<>();
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/toc/TocSortingTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/toc/TocSortingTest.java
index 03ce7cb..a978110 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/toc/TocSortingTest.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/toc/TocSortingTest.java
@@ -46,7 +46,7 @@
private String helpDataPreference;
private String baseTocsPreference;
- private class Toc implements IToc {
+ private static class Toc implements IToc {
private String label;
@@ -86,7 +86,7 @@
}
- private class TC implements ITocContribution {
+ private static class TC implements ITocContribution {
private IToc toc;
private String categoryId;
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/HelpServerInterrupt.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/HelpServerInterrupt.java
index 9cff567..8a57de0 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/HelpServerInterrupt.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/HelpServerInterrupt.java
@@ -33,7 +33,7 @@
private static boolean enableTimeout = true;
private int iterations;
private int sleepTime = 10;
- private class ServerStarter extends Thread {
+ private static class ServerStarter extends Thread {
private Exception exception = null;
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/ParallelServerAccessTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/ParallelServerAccessTest.java
index 4c0fe90..bc95f82 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/ParallelServerAccessTest.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/ParallelServerAccessTest.java
@@ -98,7 +98,7 @@
}
}
- private class UnexpectedValueException extends Exception {
+ private static class UnexpectedValueException extends Exception {
private static final long serialVersionUID = 1L;
private long expected;
private long actual;
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchData.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchData.java
index ab8e0df..8cf7e7d 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchData.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchData.java
@@ -35,7 +35,7 @@
private List<SearchResult> results;
private String searchTerm;
-public class SearchResult {
+public static class SearchResult {
public String title;
public String href;
}
