Bug 572215 - Use JDT static inner class clean up in PDE ui plug-insI20210513-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: I57d732927398b006e90012501ec4ed714003fe11
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

Change-Id: I57d732927398b006e90012501ec4ed714003fe11
Reviewed-on: https://git.eclipse.org/r/c/pde/eclipse.pde.ui/+/180216
Tested-by: PDE Bot <pde-bot@eclipse.org>
Reviewed-by: Alexander Kurtakov <akurtako@redhat.com>

60 files changed, 78 insertions, 78 deletions

diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/FeatureTable.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/FeatureTable.java
index dc212bda8d..fa173f0722 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/FeatureTable.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/FeatureTable.java
@@ -26,7 +26,7 @@ import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
  * Idver stays unchanged until the models reinserted.
  */
 class FeatureTable {
-	public class Idver {
+	public static class Idver {
 		private final String fId;
 
 		private final String fVer;
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDEClasspathContainer.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDEClasspathContainer.java
index f5d5084199..a631457afe 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDEClasspathContainer.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDEClasspathContainer.java
@@ -31,7 +31,7 @@ import org.eclipse.pde.core.plugin.PluginRegistry;
 
 public class PDEClasspathContainer {
 
-	public class Rule {
+	public static class Rule {
 		IPath path;
 		boolean discouraged;
 
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/TargetPreferenceModifyListener.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/TargetPreferenceModifyListener.java
index 1118d5a7b0..f921f59e41 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/TargetPreferenceModifyListener.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/TargetPreferenceModifyListener.java
@@ -26,7 +26,7 @@ import org.osgi.service.prefs.BackingStoreException;
  */
 public class TargetPreferenceModifyListener extends PreferenceModifyListener {
 
-	class Visitor implements IPreferenceNodeVisitor {
+	static class Visitor implements IPreferenceNodeVisitor {
 
 		@Override
 		public boolean visit(IEclipsePreferences node) throws BackingStoreException {
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/BuildErrorReporter.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/BuildErrorReporter.java
index 39a8db40b1..058a83863c 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/BuildErrorReporter.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/BuildErrorReporter.java
@@ -92,7 +92,7 @@ public class BuildErrorReporter extends ErrorReporter implements IBuildPropertie
 	private static final String JavaSE_1_6 = "JavaSE-1.6"; //$NON-NLS-1$
 	private static final String JavaSE_1_7 = "JavaSE-1.7"; //$NON-NLS-1$
 
-	class BuildProblem {
+	static class BuildProblem {
 		String fEntryToken;
 		String fEntryName;
 		String fMessage;
@@ -153,7 +153,7 @@ public class BuildErrorReporter extends ErrorReporter implements IBuildPropertie
 		}
 	}
 
-	class WildcardFilenameFilter implements FilenameFilter {
+	static class WildcardFilenameFilter implements FilenameFilter {
 
 		private final Pattern pattern;
 
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/ManifestConsistencyChecker.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/ManifestConsistencyChecker.java
index bf834a9247..b5ff2388ca 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/ManifestConsistencyChecker.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/ManifestConsistencyChecker.java
@@ -65,7 +65,7 @@ public class ManifestConsistencyChecker extends IncrementalProjectBuilder {
 
 	private final ClassChangeVisitor fClassFileVisitor = new ClassChangeVisitor();
 
-	class ClassChangeVisitor implements IResourceDeltaVisitor {
+	static class ClassChangeVisitor implements IResourceDeltaVisitor {
 		boolean hasChanged = false;
 		boolean veto = false;
 
@@ -427,7 +427,7 @@ public class ManifestConsistencyChecker extends IncrementalProjectBuilder {
 		}
 	}
 
-	class ManifestFilter implements FilenameFilter {
+	static class ManifestFilter implements FilenameFilter {
 
 		@Override
 		public boolean accept(File dir, String name) {
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/SourceEntryErrorReporter.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/SourceEntryErrorReporter.java
index 48d886d8b7..69336b7471 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/SourceEntryErrorReporter.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/SourceEntryErrorReporter.java
@@ -56,7 +56,7 @@ public class SourceEntryErrorReporter extends BuildErrorReporter {
 		fBuild = model;
 	}
 
-	class ProjectFolder {
+	static class ProjectFolder {
 		IPath fPath;
 		String fToken;
 		ArrayList<String> fLibs = new ArrayList<>(1);
@@ -98,7 +98,7 @@ public class SourceEntryErrorReporter extends BuildErrorReporter {
 		}
 	}
 
-	class SourceFolder extends ProjectFolder {
+	static class SourceFolder extends ProjectFolder {
 
 		OutputFolder fOutputFolder;
 
@@ -119,7 +119,7 @@ public class SourceEntryErrorReporter extends BuildErrorReporter {
 
 	}
 
-	class OutputFolder extends ProjectFolder {
+	static class OutputFolder extends ProjectFolder {
 
 		private final ArrayList<SourceFolder> fSourceFolders = new ArrayList<>();
 		/**
@@ -168,7 +168,7 @@ public class SourceEntryErrorReporter extends BuildErrorReporter {
 	 * Represents a default or custom encoding property for a resource
 	 * within a library.
 	 */
-	class EncodingEntry {
+	static class EncodingEntry {
 
 		private final String fEncoding;
 		private final IResource fResource;
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetPlatformService.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetPlatformService.java
index 2d46f9c5c8..ad7fb88b79 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetPlatformService.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetPlatformService.java
@@ -100,7 +100,7 @@ public class TargetPlatformService implements ITargetPlatformService {
 	/**
 	 * Collects target files in the workspace
 	 */
-	class ResourceProxyVisitor implements IResourceProxyVisitor {
+	static class ResourceProxyVisitor implements IResourceProxyVisitor {
 
 		private List<IResource> fList;
 
diff --git a/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/RemotePluginTestRunner.java b/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/RemotePluginTestRunner.java
index 5d746c87f5..9b378c2d1c 100644
--- a/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/RemotePluginTestRunner.java
+++ b/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/RemotePluginTestRunner.java
@@ -32,7 +32,7 @@ public class RemotePluginTestRunner extends RemoteTestRunner {
 	private String fTestPluginName;
 	private ClassLoader fLoaderClassLoader;
 
-	class BundleClassLoader extends ClassLoader {
+	static class BundleClassLoader extends ClassLoader {
 		private Bundle bundle;
 
 		public BundleClassLoader(Bundle target) {
diff --git a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/PDELaunchingPlugin.java b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/PDELaunchingPlugin.java
index b5c33ebbd8..4413dcc9bc 100644
--- a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/PDELaunchingPlugin.java
+++ b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/PDELaunchingPlugin.java
@@ -150,7 +150,7 @@ public class PDELaunchingPlugin extends Plugin implements IPDEConstants {
 	 *
 	 * @since 3.4
 	 */
-	private class DebugPluginUtil {
+	private static class DebugPluginUtil {
 		private ILaunchConfigurationListener fLaunchConfigurationListener;
 
 		public void addListener() {
diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/SpyFormToolkit.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/SpyFormToolkit.java
index 363d42ef9b..78cdf45e3c 100644
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/SpyFormToolkit.java
+++ b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/SpyFormToolkit.java
@@ -67,7 +67,7 @@ public class SpyFormToolkit extends FormToolkit {
 		}
 	}
 
-	private class SaveImageAction extends Action {
+	private static class SaveImageAction extends Action {
 
 		private Image image;
 
diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/util/xml/ParserWrapperTestCase.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/util/xml/ParserWrapperTestCase.java
index ec98f6ed0f..fee919c13a 100644
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/util/xml/ParserWrapperTestCase.java
+++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/util/xml/ParserWrapperTestCase.java
@@ -90,7 +90,7 @@ public class ParserWrapperTestCase {
 
 	}
 
-	public class ParserThread extends Thread {
+	public static class ParserThread extends Thread {
 
 		protected final int FITERATIONS = 100;
 		protected File fParserXMLFile;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/CommandList.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/CommandList.java
index ae89a51c55..c3753ae455 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/CommandList.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/CommandList.java
@@ -88,7 +88,7 @@ public class CommandList {
 		}
 	}
 
-	protected class CommandTreeComparator extends ViewerComparator {
+	protected static class CommandTreeComparator extends ViewerComparator {
 		@Override
 		public int compare(Viewer viewer, Object e1, Object e2) {
 			return getText(e1).compareTo(getText(e2));
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/java/UnresolvedImportFixProcessor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/java/UnresolvedImportFixProcessor.java
index 27173cf58e..50ddccae14 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/java/UnresolvedImportFixProcessor.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/java/UnresolvedImportFixProcessor.java
@@ -33,7 +33,7 @@ import org.eclipse.pde.internal.ui.correction.java.FindClassResolutionsOperation
  */
 public class UnresolvedImportFixProcessor extends ClasspathFixProcessor {
 
-	private class ClasspathFixCollector extends AbstractClassResolutionCollector {
+	private static class ClasspathFixCollector extends AbstractClassResolutionCollector {
 
 		private ArrayList<Object> fList = new ArrayList<>();
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/FeatureSelectionDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/FeatureSelectionDialog.java
index da03791416..b2a07aeec7 100755
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/FeatureSelectionDialog.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/FeatureSelectionDialog.java
@@ -105,7 +105,7 @@ public class FeatureSelectionDialog extends FilteredItemsSelectionDialog {
 		}
 	}
 
-	private class FeatureSearchComparator implements Comparator<Object> {
+	private static class FeatureSearchComparator implements Comparator<Object> {
 
 		@Override
 		public int compare(Object o1, Object o2) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/FormOutlinePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/FormOutlinePage.java
index 278d212150..995313a0f3 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/FormOutlinePage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/FormOutlinePage.java
@@ -54,7 +54,7 @@ public class FormOutlinePage extends PDEOutlinePage implements IModelChangedList
 		}
 	}
 
-	public class BasicLabelProvider extends LabelProvider {
+	public static class BasicLabelProvider extends LabelProvider {
 		private ILabelProvider fWrappedLabelProvider;
 
 		public BasicLabelProvider(ILabelProvider ilp) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/AddLibraryDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/AddLibraryDialog.java
index 98d91b3306..987504be90 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/AddLibraryDialog.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/AddLibraryDialog.java
@@ -61,7 +61,7 @@ public class AddLibraryDialog extends SelectionStatusDialog {
 		}
 	}
 
-	class TableContentProvider implements IStructuredContentProvider {
+	static class TableContentProvider implements IStructuredContentProvider {
 		@Override
 		public Object[] getElements(Object input) {
 			if (input instanceof IPluginModelBase) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildClasspathSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildClasspathSection.java
index 71078cc75c..6f4f1acd62 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildClasspathSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildClasspathSection.java
@@ -56,7 +56,7 @@ public class BuildClasspathSection extends TableSection {
 	 * type of an element.
 	 * Empty selections are not accepted.
 	 */
-	class ElementSelectionValidator implements ISelectionStatusValidator {
+	static class ElementSelectionValidator implements ISelectionStatusValidator {
 
 		private Class<?>[] fAcceptedTypes;
 		private boolean fAllowMultipleSelection;
@@ -109,7 +109,7 @@ public class BuildClasspathSection extends TableSection {
 		}
 	}
 
-	class TableContentProvider implements IStructuredContentProvider {
+	static class TableContentProvider implements IStructuredContentProvider {
 		@Override
 		public Object[] getElements(Object parent) {
 			if (parent instanceof IBuildModel) {
@@ -123,7 +123,7 @@ public class BuildClasspathSection extends TableSection {
 		}
 	}
 
-	class TableLabelProvider extends LabelProvider implements ITableLabelProvider {
+	static class TableLabelProvider extends LabelProvider implements ITableLabelProvider {
 		@Override
 		public String getColumnText(Object obj, int index) {
 			return obj.toString();
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildContentsSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildContentsSection.java
index 02b4758a65..869b85addd 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildContentsSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildContentsSection.java
@@ -44,7 +44,7 @@ public abstract class BuildContentsSection extends TableSection implements IReso
 	protected IResource fOriginalResource, fParentResource;
 	protected boolean isChecked;
 
-	public class TreeContentProvider implements ITreeContentProvider {
+	public static class TreeContentProvider implements ITreeContentProvider {
 
 		@Override
 		public Object[] getElements(Object parent) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildSourcePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildSourcePage.java
index 9201a82da8..06faaa9f82 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildSourcePage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildSourcePage.java
@@ -37,7 +37,7 @@ import org.eclipse.ui.editors.text.EditorsUI;
 import org.eclipse.ui.texteditor.ChainedPreferenceStore;
 
 public class BuildSourcePage extends KeyValueSourcePage {
-	class BuildOutlineContentProvider implements ITreeContentProvider {
+	static class BuildOutlineContentProvider implements ITreeContentProvider {
 		@Override
 		public Object[] getChildren(Object parent) {
 			return new Object[0];
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/RuntimeInfoSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/RuntimeInfoSection.java
index c309a2122e..53f4d64420 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/RuntimeInfoSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/RuntimeInfoSection.java
@@ -107,7 +107,7 @@ public class RuntimeInfoSection extends PDESection implements IBuildPropertiesCo
 		}
 	}
 
-	public class LibraryContentProvider implements IStructuredContentProvider {
+	public static class LibraryContentProvider implements IStructuredContentProvider {
 
 		@Override
 		public Object[] getElements(Object parent) {
@@ -134,7 +134,7 @@ public class RuntimeInfoSection extends PDESection implements IBuildPropertiesCo
 		}
 	}
 
-	public class LibraryLabelProvider extends LabelProvider implements ITableLabelProvider {
+	public static class LibraryLabelProvider extends LabelProvider implements ITableLabelProvider {
 		@Override
 		public String getColumnText(Object obj, int index) {
 			String name = ((IBuildEntry) obj).getName();
@@ -161,14 +161,14 @@ public class RuntimeInfoSection extends PDESection implements IBuildPropertiesCo
 		}
 	}
 
-	public class FolderContentProvider implements IStructuredContentProvider {
+	public static class FolderContentProvider implements IStructuredContentProvider {
 		@Override
 		public Object[] getElements(Object parent) {
 			return (parent instanceof IBuildEntry) ? ((IBuildEntry) parent).getTokens() : new Object[0];
 		}
 	}
 
-	public class FolderLabelProvider extends LabelProvider implements ITableLabelProvider {
+	public static class FolderLabelProvider extends LabelProvider implements ITableLabelProvider {
 		@Override
 		public String getColumnText(Object obj, int index) {
 			return obj.toString();
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/DownloadStatsSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/DownloadStatsSection.java
index 6795c9d61c..88f67dea2e 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/DownloadStatsSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/DownloadStatsSection.java
@@ -53,7 +53,7 @@ public class DownloadStatsSection extends TableSection {
 	private TableViewer fArtifactTable;
 	private ISiteModel fModel;
 
-	class ArtifactsContentProvider implements IStructuredContentProvider {
+	static class ArtifactsContentProvider implements IStructuredContentProvider {
 		@Override
 		public Object[] getElements(Object inputElement) {
 			// model = (IStatsInfo) inputElement;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/RepositoryReferenceSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/RepositoryReferenceSection.java
index e5b9f96abd..be3b3af720 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/RepositoryReferenceSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/RepositoryReferenceSection.java
@@ -137,7 +137,7 @@ public class RepositoryReferenceSection extends TableSection {
 	}
 
 
-	private class ContentProvider implements IStructuredContentProvider {
+	private static class ContentProvider implements IStructuredContentProvider {
 
 		ContentProvider() {
 		}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/IncludedFeaturesSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/IncludedFeaturesSection.java
index 026211f971..1e7d083e7f 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/IncludedFeaturesSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/IncludedFeaturesSection.java
@@ -66,7 +66,7 @@ public class IncludedFeaturesSection extends TableSection implements IFeatureMod
 
 	private SortAction fSortAction;
 
-	class IncludedFeaturesContentProvider implements IStructuredContentProvider {
+	static class IncludedFeaturesContentProvider implements IStructuredContentProvider {
 		@Override
 		public Object[] getElements(Object parent) {
 			if (parent instanceof IFeature) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PluginSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PluginSection.java
index 9539c4005a..e537995a43 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PluginSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PluginSection.java
@@ -64,7 +64,7 @@ public class PluginSection extends TableSection implements IPluginModelListener
 
 	private SortAction fSortAction;
 
-	class PluginContentProvider implements IStructuredContentProvider {
+	static class PluginContentProvider implements IStructuredContentProvider {
 		@Override
 		public Object[] getElements(Object parent) {
 			if (parent instanceof IFeature) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PortabilityChoicesDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PortabilityChoicesDialog.java
index 8d9ac51f25..015f1fe5df 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PortabilityChoicesDialog.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PortabilityChoicesDialog.java
@@ -42,7 +42,7 @@ public class PortabilityChoicesDialog extends TrayDialog {
 		}
 	}
 
-	class ChoiceLabelProvider extends LabelProvider implements ITableLabelProvider {
+	static class ChoiceLabelProvider extends LabelProvider implements ITableLabelProvider {
 		@Override
 		public String getColumnText(Object obj, int index) {
 			return ((Choice) obj).getLabel();
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/RequiresSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/RequiresSection.java
index a74bacd1c8..4a1bb47489 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/RequiresSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/RequiresSection.java
@@ -70,7 +70,7 @@ public class RequiresSection extends TableSection implements IPluginModelListene
 	private SortAction fSortAction;
 	private Action fOpenAction;
 
-	class ImportContentProvider implements IStructuredContentProvider {
+	static class ImportContentProvider implements IStructuredContentProvider {
 		@Override
 		public Object[] getElements(Object parent) {
 			if (parent instanceof IFeature) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/URLSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/URLSection.java
index f5846d184d..a11ce5544c 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/URLSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/URLSection.java
@@ -47,7 +47,7 @@ public class URLSection extends TableSection {
 
 	private Image fUrlImage;
 
-	class URLContentProvider implements IStructuredContentProvider {
+	static class URLContentProvider implements IStructuredContentProvider {
 		@Override
 		public Object[] getElements(Object input) {
 			IFeature feature = (IFeature) input;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExecutionEnvironmentSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExecutionEnvironmentSection.java
index 98e549d47a..29437d135e 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExecutionEnvironmentSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExecutionEnvironmentSection.java
@@ -84,7 +84,7 @@ public class ExecutionEnvironmentSection extends TableSection {
 		}
 	}
 
-	class ContentProvider implements IStructuredContentProvider {
+	static class ContentProvider implements IStructuredContentProvider {
 		@Override
 		public Object[] getElements(Object inputElement) {
 			if (inputElement instanceof IBundleModel) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExportPackageVisibilitySection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExportPackageVisibilitySection.java
index 38eb8f63a4..6502316200 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExportPackageVisibilitySection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExportPackageVisibilitySection.java
@@ -62,7 +62,7 @@ public class ExportPackageVisibilitySection extends TableSection implements IPar
 	private Image fImage;
 	private Button fVisibleButton;
 
-	class TableContentProvider implements IStructuredContentProvider {
+	static class TableContentProvider implements IStructuredContentProvider {
 		@Override
 		public Object[] getElements(Object parent) {
 			ExportPackageObject object = (ExportPackageObject) parent;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ImportPackageSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ImportPackageSection.java
index d0f5f7e96f..2269a144c3 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ImportPackageSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ImportPackageSection.java
@@ -67,7 +67,7 @@ public class ImportPackageSection extends TableSection {
 
 	private ImportPackageHeader fHeader;
 
-	class ImportItemWrapper {
+	static class ImportItemWrapper {
 		Object fUnderlying;
 
 		public ImportItemWrapper(Object underlying) {
@@ -134,7 +134,7 @@ public class ImportPackageSection extends TableSection {
 		}
 	}
 
-	class ImportPackageDialogLabelProvider extends LabelProvider {
+	static class ImportPackageDialogLabelProvider extends LabelProvider {
 		@Override
 		public Image getImage(Object element) {
 			return JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_PACKAGE);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/LibraryVisibilitySection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/LibraryVisibilitySection.java
index 8742367dce..fafff798be 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/LibraryVisibilitySection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/LibraryVisibilitySection.java
@@ -58,7 +58,7 @@ public class LibraryVisibilitySection extends TableSection implements IPartSelec
 	private Action fAddAction;
 	private Action fRemoveAction;
 
-	class TableContentProvider implements IStructuredContentProvider {
+	static class TableContentProvider implements IStructuredContentProvider {
 		@Override
 		public Object[] getElements(Object parent) {
 			if (parent instanceof IPluginLibrary) {
@@ -69,7 +69,7 @@ public class LibraryVisibilitySection extends TableSection implements IPartSelec
 		}
 	}
 
-	class TableLabelProvider extends LabelProvider implements ITableLabelProvider {
+	static class TableLabelProvider extends LabelProvider implements ITableLabelProvider {
 
 		@Override
 		public String getColumnText(Object obj, int index) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/JRESection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/JRESection.java
index afa9fefb21..b1d2967916 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/JRESection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/JRESection.java
@@ -46,7 +46,7 @@ import org.eclipse.ui.forms.widgets.*;
 
 public class JRESection extends PDESection {
 
-	private final class EELabelProvider extends LabelProvider {
+	private static final class EELabelProvider extends LabelProvider {
 		@Override
 		public String getText(Object element) {
 			if (!(element instanceof IExecutionEnvironment))
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PluginConfigurationSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PluginConfigurationSection.java
index 3b5fccf60e..98573086c8 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PluginConfigurationSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PluginConfigurationSection.java
@@ -50,7 +50,7 @@ import org.eclipse.ui.forms.widgets.Section;
 
 public class PluginConfigurationSection extends TableSection {
 
-	private class ContentProvider implements IStructuredContentProvider {
+	private static class ContentProvider implements IStructuredContentProvider {
 
 		private IProduct fProduct;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PropertiesSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PropertiesSection.java
index 3362288f1d..8650073a24 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PropertiesSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PropertiesSection.java
@@ -49,7 +49,7 @@ import org.eclipse.ui.forms.widgets.Section;
  */
 public class PropertiesSection extends TableSection {
 
-	private class ContentProvider implements IStructuredContentProvider {
+	private static class ContentProvider implements IStructuredContentProvider {
 
 		ContentProvider() {
 		}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/UpdatesSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/UpdatesSection.java
index 73b50a1713..10e1e6c143 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/UpdatesSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/UpdatesSection.java
@@ -133,7 +133,7 @@ public class UpdatesSection extends TableSection {
 	}
 
 
-	private class ContentProvider implements IStructuredContentProvider {
+	private static class ContentProvider implements IStructuredContentProvider {
 
 		ContentProvider() {
 		}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementSection.java
index 34c9a5932a..39b887902b 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementSection.java
@@ -49,7 +49,7 @@ public class ElementSection extends TreeSection {
 	private SchemaRearranger fRearranger;
 	private CollapseAction fCollapseAction;
 
-	class ContentProvider implements ITreeContentProvider {
+	static class ContentProvider implements ITreeContentProvider {
 		@Override
 		public Object[] getElements(Object object) {
 			if (object instanceof Schema) {
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 5e223932df..b8d36ba653 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
@@ -54,7 +54,7 @@ public class FilteredSchemaAttributeSelectionDialog extends FilteredItemsSelecti
 
 	}
 
-	private class OptionalAttributesFilter extends ViewerFilter {
+	private static class OptionalAttributesFilter extends ViewerFilter {
 
 		private boolean enabled = true;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/ArchiveSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/ArchiveSection.java
index a7d06042bb..dda7067e9f 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/ArchiveSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/ArchiveSection.java
@@ -62,7 +62,7 @@ public class ArchiveSection extends PDESection {
 		}
 	}
 
-	class ContentProvider implements IStructuredContentProvider {
+	static class ContentProvider implements IStructuredContentProvider {
 		@Override
 		public Object[] getElements(Object parent) {
 			ISiteModel model = (ISiteModel) parent;
@@ -70,7 +70,7 @@ public class ArchiveSection extends PDESection {
 		}
 	}
 
-	class ArchiveLabelProvider extends LabelProvider implements ITableLabelProvider {
+	static class ArchiveLabelProvider extends LabelProvider implements ITableLabelProvider {
 		@Override
 		public String getColumnText(Object obj, int index) {
 			ISiteArchive archive = (ISiteArchive) obj;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/FeatureBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/FeatureBlock.java
index 5817e14de9..2cb79c0db9 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/FeatureBlock.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/FeatureBlock.java
@@ -701,7 +701,7 @@ public class FeatureBlock {
 
 	}
 
-	class FeatureLaunchModel {
+	static class FeatureLaunchModel {
 		public IFeatureModel fWorkspaceModel;
 		public IFeatureModel fTargetModel;
 		public String fPluginResolution;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/TracingBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/TracingBlock.java
index 2300112f71..c60cf3891c 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/TracingBlock.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/TracingBlock.java
@@ -485,7 +485,7 @@ public class TracingBlock {
 		fPropertySources.clear();
 	}
 
-	private class PageBookKey {
+	private static class PageBookKey {
 		IPluginModelBase fModel;
 		boolean fEnabled;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/InternationalizeWizardLocalePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/InternationalizeWizardLocalePage.java
index 70e2f53c0e..e6f1e8f64e 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/InternationalizeWizardLocalePage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/InternationalizeWizardLocalePage.java
@@ -70,7 +70,7 @@ public class InternationalizeWizardLocalePage extends InternationalizationWizard
 
 	private ILabelProvider fLabelProvider = PDEPlugin.getDefault().getLabelProvider();
 
-	private class ContentProvider implements IStructuredContentProvider {
+	private static class ContentProvider implements IStructuredContentProvider {
 		@Override
 		public Object[] getElements(Object inputElement) {
 			return ((InternationalizeModelTable) inputElement).getModels();
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/PluginVersionPart.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/PluginVersionPart.java
index 149690ffba..949e961318 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/PluginVersionPart.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/PluginVersionPart.java
@@ -77,7 +77,7 @@ public class PluginVersionPart {
 
 	}
 
-	private class PluginVersionContentProvider implements IStructuredContentProvider {
+	private static class PluginVersionContentProvider implements IStructuredContentProvider {
 
 		@Override
 		public Object[] getElements(Object element) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/AbstractSearchResultPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/AbstractSearchResultPage.java
index f3d62e2366..a1d5394a81 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/AbstractSearchResultPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/AbstractSearchResultPage.java
@@ -19,7 +19,7 @@ import org.eclipse.search.ui.text.AbstractTextSearchViewPage;
 
 public abstract class AbstractSearchResultPage extends AbstractTextSearchViewPage {
 
-	class ContentProvider implements IStructuredContentProvider {
+	static class ContentProvider implements IStructuredContentProvider {
 
 		private TableViewer fTableViewer;
 		private AbstractTextSearchResult fSearchResult;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchPage.java
index c043d3642e..4f5afe56b6 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchPage.java
@@ -37,7 +37,7 @@ import org.eclipse.ui.*;
 
 public class PluginSearchPage extends DialogPage implements ISearchPage {
 
-	class QueryData {
+	static class QueryData {
 		public String text;
 		public boolean isCaseSensitive;
 		public int searchElement;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchResultPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchResultPage.java
index 0390f9ac84..8baeb9b6f1 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchResultPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchResultPage.java
@@ -30,7 +30,7 @@ import org.eclipse.ui.actions.ActionContext;
 
 public class PluginSearchResultPage extends AbstractSearchResultPage {
 
-	class SearchLabelProvider extends LabelProvider {
+	static class SearchLabelProvider extends LabelProvider {
 		@Override
 		public Image getImage(Object element) {
 			if (element instanceof IFeaturePlugin) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentOperation.java
index 6e0651f0a1..1e8f9afbf2 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentOperation.java
@@ -27,7 +27,7 @@ import org.eclipse.search.ui.text.Match;
 
 public class DependencyExtentOperation {
 
-	class TypeReferenceSearchRequestor extends SearchRequestor {
+	static class TypeReferenceSearchRequestor extends SearchRequestor {
 		boolean fUsed = false;
 
 		@Override
@@ -42,7 +42,7 @@ public class DependencyExtentOperation {
 		}
 	}
 
-	class TypeDeclarationSearchRequestor extends SearchRequestor {
+	static class TypeDeclarationSearchRequestor extends SearchRequestor {
 
 		private Match fMatch;
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentSearchResultPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentSearchResultPage.java
index fe9b606a5c..c3eb790f55 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentSearchResultPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentSearchResultPage.java
@@ -30,7 +30,7 @@ import org.eclipse.ui.actions.ActionContext;
 
 public class DependencyExtentSearchResultPage extends AbstractSearchResultPage {
 
-	class Comparator extends ViewerComparator {
+	static class Comparator extends ViewerComparator {
 		@Override
 		public int category(Object element) {
 			try {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dialogs/FilteredIUSelectionDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dialogs/FilteredIUSelectionDialog.java
index 6dbeb0ead3..8abc10fc52 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dialogs/FilteredIUSelectionDialog.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dialogs/FilteredIUSelectionDialog.java
@@ -51,7 +51,7 @@ public class FilteredIUSelectionDialog extends FilteredItemsSelectionDialog {
 //	private static final int TYPE_FEATURE = 1;
 //	private static final int TYPE_PACKAGE = 2;
 
-	private class IUWrapperLabelProvider extends LabelProvider implements DelegatingStyledCellLabelProvider.IStyledLabelProvider {
+	private static class IUWrapperLabelProvider extends LabelProvider implements DelegatingStyledCellLabelProvider.IStyledLabelProvider {
 
 		private PDELabelProvider labelProvider;
 
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 549beeef87..8eeadbec21 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
@@ -531,7 +531,7 @@ public class FilteredPluginArtifactsSelectionDialog extends FilteredItemsSelecti
 		settings.put(S_FEATURES, featuresAction.isChecked());
 	}
 
-	private class PluginSearchSelectionHistory extends SelectionHistory {
+	private static class PluginSearchSelectionHistory extends SelectionHistory {
 
 		private static final String M_ID = "id"; //$NON-NLS-1$
 		private static final String M_PLUGIN_VERSION = "p_version"; //$NON-NLS-1$
@@ -717,7 +717,7 @@ public class FilteredPluginArtifactsSelectionDialog extends FilteredItemsSelecti
 		}
 	}
 
-	private class PluginSearchComparator implements Comparator<Object> {
+	private static class PluginSearchComparator implements Comparator<Object> {
 
 		@Override
 		public int compare(Object o1, Object o2) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/AddBundleContainerSelectionPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/AddBundleContainerSelectionPage.java
index a7ff4a8406..4dadced9dc 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/AddBundleContainerSelectionPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/AddBundleContainerSelectionPage.java
@@ -403,7 +403,7 @@ public class AddBundleContainerSelectionPage extends WizardSelectionPage {
 	 * Abstract implementation of the IWizardNode interface providing a consistent look and feel
 	 * for the table displaying a list of possible bundle container types.
 	 */
-	abstract class AbstractBundleContainerNode implements IWizardNode {
+	abstract static class AbstractBundleContainerNode implements IWizardNode {
 		private String fTypeName;
 		private String fTypeDescription;
 		private Image fTypeImage;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesViewPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesViewPage.java
index b5fa95f97d..1f032d0a3e 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesViewPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesViewPage.java
@@ -78,7 +78,7 @@ public abstract class DependenciesViewPage extends Page {
 
 	private static final String HIDE_OPTIONAL = "hideOptional"; //$NON-NLS-1$
 
-	class FragmentFilter extends ViewerFilter {
+	static class FragmentFilter extends ViewerFilter {
 
 		@Override
 		public boolean select(Viewer v, Object parent, Object element) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesViewTreePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesViewTreePage.java
index 86bf14ab8e..bb1c66ce04 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesViewTreePage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesViewTreePage.java
@@ -41,7 +41,7 @@ public class DependenciesViewTreePage extends DependenciesViewPage {
 		}
 	}
 
-	class OptionalFilter extends ViewerFilter {
+	static class OptionalFilter extends ViewerFilter {
 
 		@Override
 		public boolean select(Viewer v, Object parent, Object element) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/PluginsView.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/PluginsView.java
index 5b62aad02d..aa2a4f657e 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/PluginsView.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/PluginsView.java
@@ -87,7 +87,7 @@ public class PluginsView extends ViewPart implements IPluginModelListener {
 	private Clipboard fClipboard;
 	private Object fRoot = null;
 
-	class DisabledFilter extends ViewerFilter {
+	static class DisabledFilter extends ViewerFilter {
 
 		boolean fEnabled;
 
@@ -105,7 +105,7 @@ public class PluginsView extends ViewPart implements IPluginModelListener {
 		}
 	}
 
-	class WorkspaceFilter extends ViewerFilter {
+	static class WorkspaceFilter extends ViewerFilter {
 		@Override
 		public boolean select(Viewer v, Object parent, Object element) {
 			if (element instanceof IPluginModelBase) {
@@ -116,7 +116,7 @@ public class PluginsView extends ViewPart implements IPluginModelListener {
 		}
 	}
 
-	class JavaFilter extends ViewerFilter {
+	static class JavaFilter extends ViewerFilter {
 		@Override
 		public boolean select(Viewer v, Object parent, Object element) {
 			if (element instanceof IPackageFragment) {
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 033c6ac9e7..537738809d 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
@@ -90,7 +90,7 @@ public class StateViewPage extends Page implements IStateDeltaListener, IPluginM
 		}
 	}
 
-	class StateContentProvider implements ITreeContentProvider {
+	static class StateContentProvider implements ITreeContentProvider {
 
 		@Override
 		public Object[] getChildren(Object parentElement) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardDetailedPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardDetailedPage.java
index 273160e6dc..f762a189a4 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardDetailedPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardDetailedPage.java
@@ -128,7 +128,7 @@ public class PluginImportWizardDetailedPage extends BaseImportWizardSecondPage {
 	 * This filter is used to remove older plug-ins from view
 	 *
 	 */
-	private class VersionFilter extends ViewerFilter {
+	private static class VersionFilter extends ViewerFilter {
 		private HashMap<String, Version> versions = new HashMap<>();
 
 		public void setModel(IPluginModelBase[] plugins) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardExpressPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardExpressPage.java
index 3726e72146..7bcce6d70b 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardExpressPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardExpressPage.java
@@ -48,7 +48,7 @@ public class PluginImportWizardExpressPage extends BaseImportWizardSecondPage {
 	private IStructuredSelection fInitialSelection;
 	private Label fCounterLabel;
 
-	class PluginContentProvider implements IStructuredContentProvider {
+	static class PluginContentProvider implements IStructuredContentProvider {
 		@Override
 		public Object[] getElements(Object parent) {
 			IProject[] projects = PDEPlugin.getWorkspace().getRoot().getProjects();
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 223f512766..d5a10f5b42 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
@@ -50,7 +50,7 @@ public class PreprocessorParser {
 		abstract Object getValue();
 	}
 
-	class LeafNode extends Node {
+	static class LeafNode extends Node {
 		Object value;
 
 		LeafNode(Object value) {
@@ -70,7 +70,7 @@ public class PreprocessorParser {
 		}
 	}
 
-	class ExpressionNode extends Node {
+	static class ExpressionNode extends Node {
 		int opcode;
 		Node left;
 		Node right;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/TemplateSelectionPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/TemplateSelectionPage.java
index ada3777d43..12acb50ecd 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/TemplateSelectionPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/TemplateSelectionPage.java
@@ -62,7 +62,7 @@ public class TemplateSelectionPage extends WizardPage {
 		}
 	}
 
-	class ListLabelProvider extends LabelProvider implements ITableLabelProvider {
+	static class ListLabelProvider extends LabelProvider implements ITableLabelProvider {
 		@Override
 		public String getColumnText(Object obj, int index) {
 			ITemplateSection section = (ITemplateSection) obj;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ConvertedProjectsPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ConvertedProjectsPage.java
index 2449319179..be831a65c3 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ConvertedProjectsPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ConvertedProjectsPage.java
@@ -58,7 +58,7 @@ public class ConvertedProjectsPage extends WizardPage {
 	/**
 	 * Label provider for the table
 	 */
-	public class ProjectLabelProvider extends LabelProvider {
+	public static class ProjectLabelProvider extends LabelProvider {
 		@Override
 		public Image getImage(Object element) {
 			return PlatformUI.getWorkbench().getSharedImages().getImage(IDE.SharedImages.IMG_OBJ_PROJECT);
diff --git a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/SelectionPage.java b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/SelectionPage.java
index fee9b8c721..23b42d8a64 100644
--- a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/SelectionPage.java
+++ b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/SelectionPage.java
@@ -59,7 +59,7 @@ public class SelectionPage extends WizardPage {
 		}
 	}
 
-	class SampleLabelProvider extends LabelProvider {
+	static class SampleLabelProvider extends LabelProvider {
 		private Image image;
 
 		public SampleLabelProvider() {