Bug 572215 - Use JDT static inner class clean up in PDEI20210331-1800I20210330-1800I20210329-1800I20210329-0200I20210328-1800I20210327-1800I20210326-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: I057d06e332ab147a3cbc9d3ba0e4577164301079
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

16 files changed, 21 insertions, 21 deletions

diff --git a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/TypePackageCompletionProcessor.java b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/TypePackageCompletionProcessor.java
index 32f13b1975..9da46e1fcd 100644
--- a/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/TypePackageCompletionProcessor.java
+++ b/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/contentassist/TypePackageCompletionProcessor.java
@@ -53,7 +53,7 @@ public abstract class TypePackageCompletionProcessor implements IContentAssistPr
 	private SearchEngine fSearchEngine;
 	private Comparator<ICompletionProposal> fComparator;
 
-	abstract class ProposalGenerator {
+	abstract static class ProposalGenerator {
 		abstract protected ICompletionProposal generateClassCompletion(String pName, String cName, boolean isClass);
 
 		abstract protected ICompletionProposal generatePackageCompletion(String pName);
diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/project/ClasspathContainerInitializer.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/project/ClasspathContainerInitializer.java
index 2a42306c0d..b20986dd8a 100644
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/project/ClasspathContainerInitializer.java
+++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/project/ClasspathContainerInitializer.java
@@ -31,7 +31,7 @@ public class ClasspathContainerInitializer extends org.eclipse.jdt.core.Classpat
 		JavaCore.setClasspathContainer(containerPath, new IJavaProject[]{project}, new IClasspathContainer[]{new ClasspathContainer(PATH)}, null);
 	}
 
-	class ClasspathContainer implements IClasspathContainer {
+	static class ClasspathContainer implements IClasspathContainer {
 
 		private IPath fPath;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/TypePackageCompletionProcessor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/TypePackageCompletionProcessor.java
index 7c7aed3ba5..7cc83d8ff2 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/TypePackageCompletionProcessor.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/TypePackageCompletionProcessor.java
@@ -33,7 +33,7 @@ public abstract class TypePackageCompletionProcessor implements IContentAssistPr
 	private SearchEngine fSearchEngine;
 	private Comparator<Object> fComparator;
 
-	abstract class ProposalGenerator {
+	abstract static class ProposalGenerator {
 		abstract protected ICompletionProposal generateClassCompletion(String pName, String cName, boolean isClass);
 
 		abstract protected ICompletionProposal generatePackageCompletion(String pName);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizardPage.java
index b849eec769..d81c7058ed 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizardPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizardPage.java
@@ -35,7 +35,7 @@ public class JavaAttributeWizardPage extends NewClassWizardPage {
 	private InitialClassProperties initialValues;
 	private IJavaProject javaProject;
 
-	class InitialClassProperties {
+	static class InitialClassProperties {
 		// populate new wizard page
 		IType superClassType;
 		String superClassName;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/FilteredSchemaAttributeSelectionDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/FilteredSchemaAttributeSelectionDialog.java
index 05271b7300..5e223932df 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/FilteredSchemaAttributeSelectionDialog.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/FilteredSchemaAttributeSelectionDialog.java
@@ -169,7 +169,7 @@ public class FilteredSchemaAttributeSelectionDialog extends FilteredItemsSelecti
 		}
 	}
 
-	private class SchemaComparator implements Comparator<Object> {
+	private static class SchemaComparator implements Comparator<Object> {
 
 		@Override
 		public int compare(Object arg0, Object arg1) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ManifestConfiguration.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ManifestConfiguration.java
index 1d6450c5b0..7844e65f5c 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ManifestConfiguration.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ManifestConfiguration.java
@@ -153,7 +153,7 @@ public class ManifestConfiguration extends ChangeAwareSourceViewerConfiguration
 		}
 	}
 
-	class AssignmentDetector implements IWordDetector {
+	static class AssignmentDetector implements IWordDetector {
 		@Override
 		public boolean isWordStart(char c) {
 			return c == ':' || c == '=';
@@ -165,7 +165,7 @@ public class ManifestConfiguration extends ChangeAwareSourceViewerConfiguration
 		}
 	}
 
-	class KeywordDetector implements IWordDetector {
+	static class KeywordDetector implements IWordDetector {
 		@Override
 		public boolean isWordStart(char c) {
 			return Character.isJavaIdentifierStart(c);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/PDEMarkerAnnotationModel.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/PDEMarkerAnnotationModel.java
index 906bbab220..33aa63ab84 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/PDEMarkerAnnotationModel.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/PDEMarkerAnnotationModel.java
@@ -20,7 +20,7 @@ import org.eclipse.ui.texteditor.ResourceMarkerAnnotationModel;
 
 public class PDEMarkerAnnotationModel extends ResourceMarkerAnnotationModel {
 
-	class PDEMarkerAnnotation extends MarkerAnnotation {
+	static class PDEMarkerAnnotation extends MarkerAnnotation {
 		boolean quickFixableState;
 		boolean isQuickFixable;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/GatherUnusedDependenciesOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/GatherUnusedDependenciesOperation.java
index d8dd437626..7d7f035000 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/GatherUnusedDependenciesOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/GatherUnusedDependenciesOperation.java
@@ -33,7 +33,7 @@ import org.osgi.framework.Constants;
 
 public class GatherUnusedDependenciesOperation implements IRunnableWithProgress {
 
-	class Requestor extends SearchRequestor {
+	static class Requestor extends SearchRequestor {
 		boolean fFound = false;
 
 		@Override
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dialogs/FilteredPluginArtifactsSelectionDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dialogs/FilteredPluginArtifactsSelectionDialog.java
index 1c0b3ab5fd..549beeef87 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dialogs/FilteredPluginArtifactsSelectionDialog.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dialogs/FilteredPluginArtifactsSelectionDialog.java
@@ -215,7 +215,7 @@ public class FilteredPluginArtifactsSelectionDialog extends FilteredItemsSelecti
 
 	}
 
-	private class ExtensionsFilter extends ViewerFilter {
+	private static class ExtensionsFilter extends ViewerFilter {
 
 		private boolean enabled = true;
 
@@ -235,7 +235,7 @@ public class FilteredPluginArtifactsSelectionDialog extends FilteredItemsSelecti
 		}
 	}
 
-	private class ExtensionPointsFilter extends ViewerFilter {
+	private static class ExtensionPointsFilter extends ViewerFilter {
 
 		private boolean enabled = true;
 
@@ -256,7 +256,7 @@ public class FilteredPluginArtifactsSelectionDialog extends FilteredItemsSelecti
 
 	}
 
-	private class ExportedPackagesFilter extends ViewerFilter {
+	private static class ExportedPackagesFilter extends ViewerFilter {
 
 		private boolean enabled = true;
 
@@ -277,7 +277,7 @@ public class FilteredPluginArtifactsSelectionDialog extends FilteredItemsSelecti
 
 	}
 
-	private class FeaturesFilter extends ViewerFilter {
+	private static class FeaturesFilter extends ViewerFilter {
 
 		private boolean enabled = true;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/IUContentProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/IUContentProvider.java
index 537ce21985..2ba3b50047 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/IUContentProvider.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/IUContentProvider.java
@@ -76,7 +76,7 @@ public class IUContentProvider implements ITreeContentProvider {
 	 * Wraps an installable unit so that it knows what bundle container parent it belongs to
 	 * in the tree.
 	 */
-	public class IUWrapper {
+	public static class IUWrapper {
 		private IInstallableUnit fIU;
 		private IUBundleContainer fParent;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/PluginWorkingSet.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/PluginWorkingSet.java
index 297533638f..b492489922 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/PluginWorkingSet.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/PluginWorkingSet.java
@@ -36,7 +36,7 @@ import org.eclipse.ui.dialogs.*;
 
 public class PluginWorkingSet extends WizardPage implements IWorkingSetPage {
 
-	class ContentProvider implements ITreeContentProvider {
+	static class ContentProvider implements ITreeContentProvider {
 		@Override
 		public Object[] getElements(Object inputElement) {
 			return PluginRegistry.getAllModels();
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/target/StateViewPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/target/StateViewPage.java
index e51d20d184..033c6ac9e7 100755
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/target/StateViewPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/target/StateViewPage.java
@@ -73,7 +73,7 @@ public class StateViewPage extends Page implements IStateDeltaListener, IPluginM
 		}
 	};
 
-	class DependencyGroup {
+	static class DependencyGroup {
 		Object[] dependencies;
 
 		public DependencyGroup(Object[] constraints) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/BaseImportWizardSecondPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/BaseImportWizardSecondPage.java
index 508e65063a..e7872533d9 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/BaseImportWizardSecondPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/BaseImportWizardSecondPage.java
@@ -50,7 +50,7 @@ public abstract class BaseImportWizardSecondPage extends WizardPage implements I
 	protected TableViewer fImportListViewer;
 	private boolean fRefreshNeeded = true;
 
-	class ContentProvider implements IStructuredContentProvider {
+	static class ContentProvider implements IStructuredContentProvider {
 		@Override
 		public Object[] getElements(Object element) {
 			return new Object[0];
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/OverwriteProjectsSelectionDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/OverwriteProjectsSelectionDialog.java
index 50e108ad65..50971b0f66 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/OverwriteProjectsSelectionDialog.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/OverwriteProjectsSelectionDialog.java
@@ -45,7 +45,7 @@ public class OverwriteProjectsSelectionDialog extends SelectionStatusDialog {
 
 	private static final String ID = "id"; //$NON-NLS-1$
 
-	private class PluginContentProvider implements ITreeContentProvider {
+	private static class PluginContentProvider implements ITreeContentProvider {
 
 		@Override
 		public Object[] getChildren(Object parentElement) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/ControlStack.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/ControlStack.java
index b970ecb1d3..f0fbe31a74 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/ControlStack.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/ControlStack.java
@@ -20,7 +20,7 @@ public class ControlStack {
 	private Stack<Entry> stack;
 	private PreprocessorParser parser;
 
-	class Entry {
+	static class Entry {
 		boolean value;
 	}
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PreprocessorParser.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PreprocessorParser.java
index 1098a3aad1..223f512766 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PreprocessorParser.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PreprocessorParser.java
@@ -46,7 +46,7 @@ public class PreprocessorParser {
 	private int loc;
 	private String tvalue;
 
-	abstract class Node {
+	abstract static class Node {
 		abstract Object getValue();
 	}
 
@@ -132,7 +132,7 @@ public class PreprocessorParser {
 		}
 	}
 
-	class RootEntry {
+	static class RootEntry {
 		Node root;
 	}