Bug 528831: Use static inner classes where possible - Part 4
If an an inner class, but does not use its embedded reference to the
object which created it. This reference makes the instances of the class
larger, and may keep the reference to the creator object alive longer
than necessary. If possible, the class should be made static.
Signed-off-by: Matthias Becker <ma.becker@sap.com>
Change-Id: I13ae38358235bd7f801aa23c5ad594db7491159a
diff --git a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserPreferencePage.java b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserPreferencePage.java
index 4bde905..8130e6e 100644
--- a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserPreferencePage.java
+++ b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserPreferencePage.java
@@ -80,7 +80,7 @@
protected IBrowserDescriptor checkedBrowser;
- class BrowserTableContentProvider implements IStructuredContentProvider {
+ static class BrowserTableContentProvider implements IStructuredContentProvider {
private BrowserManager input;
@Override
@@ -94,7 +94,7 @@
}
}
- class BrowserTableLabelProvider implements ITableLabelProvider {
+ static class BrowserTableLabelProvider implements ITableLabelProvider {
@Override
public Image getColumnImage(Object element, int columnIndex) {
return null;
diff --git a/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormFonts.java b/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormFonts.java
index 4cc41ac..b20f628 100644
--- a/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormFonts.java
+++ b/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormFonts.java
@@ -36,7 +36,7 @@
private FormFonts() {
}
- private class BoldFontDescriptor extends FontDescriptor {
+ private static class BoldFontDescriptor extends FontDescriptor {
private FontData[] fFontData;
BoldFontDescriptor (Font font) {
diff --git a/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormHeading.java b/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormHeading.java
index 6d88f42..304ee64 100644
--- a/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormHeading.java
+++ b/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormHeading.java
@@ -116,7 +116,7 @@
}
}
- private class GradientInfo {
+ private static class GradientInfo {
Color[] gradientColors;
int[] percents;
diff --git a/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormTextModel.java b/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormTextModel.java
index b86096f..546fb07 100644
--- a/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormTextModel.java
+++ b/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormTextModel.java
@@ -38,7 +38,7 @@
/*
* This class prevents parse errors from being written to standard output
*/
- public class ParseErrorHandler implements ErrorHandler {
+ public static class ParseErrorHandler implements ErrorHandler {
@Override
public void error(SAXParseException arg0) throws SAXException {
diff --git a/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java b/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java
index 5e04eb8..2652670 100644
--- a/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java
+++ b/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java
@@ -430,7 +430,7 @@
job.schedule();
}
- private class CancelableProgressMonitorWrapper extends
+ private static class CancelableProgressMonitorWrapper extends
ProgressMonitorWrapper {
private double total = 0;
private ProgressMonitorJobsDialog dialog;
@@ -473,7 +473,7 @@
}
}
- private class CancelableProgressMonitorJobsDialog extends
+ private static class CancelableProgressMonitorJobsDialog extends
ProgressMonitorJobsDialog {
public CancelableProgressMonitorJobsDialog(Shell parent) {
diff --git a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/FilteredResourcesSelectionDialog.java b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/FilteredResourcesSelectionDialog.java
index e5c4de7..24ef2a1 100644
--- a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/FilteredResourcesSelectionDialog.java
+++ b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/FilteredResourcesSelectionDialog.java
@@ -824,7 +824,7 @@
/**
* Viewer filter which filters resources due to current working set
*/
- private class CustomWorkingSetFilter extends ViewerFilter {
+ private static class CustomWorkingSetFilter extends ViewerFilter {
private ResourceWorkingSetFilter resourceWorkingSetFilter = new ResourceWorkingSetFilter();
/**
@@ -850,7 +850,7 @@
* During visit resources it updates progress monitor and adds matched
* resources to ContentProvider instance.
*/
- private class ResourceProxyVisitor implements IResourceProxyVisitor {
+ private static class ResourceProxyVisitor implements IResourceProxyVisitor {
private AbstractContentProvider proxyContentProvider;
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchErrorHandler.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchErrorHandler.java
index 3d1ca47..11000a5 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchErrorHandler.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchErrorHandler.java
@@ -261,7 +261,7 @@
}
}
- private class FatalErrorDialog extends InternalErrorDialog {
+ private static class FatalErrorDialog extends InternalErrorDialog {
/**
* @param parentShell
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/ResourceDragAndDropEditor.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/ResourceDragAndDropEditor.java
index ed56b2e..c14acea 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/ResourceDragAndDropEditor.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/ResourceDragAndDropEditor.java
@@ -26,7 +26,7 @@
*/
public class ResourceDragAndDropEditor {
- class PreferenceGroup
+ static class PreferenceGroup
{
Group group;
String preferenceKey;
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/CleanDialog.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/CleanDialog.java
index 8606e82..571d5f6 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/CleanDialog.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/CleanDialog.java
@@ -87,7 +87,7 @@
*/
public class CleanDialog extends MessageDialog {
- private class ProjectSubsetBuildAction extends BuildAction {
+ private static class ProjectSubsetBuildAction extends BuildAction {
private IProject[] projectsToBuild = new IProject[0];
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/model/WorkingSetAdapterFactory.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/model/WorkingSetAdapterFactory.java
index 795d0a9..7af9fa2 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/model/WorkingSetAdapterFactory.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/model/WorkingSetAdapterFactory.java
@@ -31,7 +31,7 @@
* Adapter for converting a working set to a resource mapping for use by
* object contributions.
*/
- class ContributorResourceAdapter implements IContributorResourceAdapter2 {
+ static class ContributorResourceAdapter implements IContributorResourceAdapter2 {
@Override
public ResourceMapping getAdaptedResourceMapping(IAdaptable adaptable) {
@@ -58,7 +58,7 @@
}
- class WorkbenchAdapter implements IWorkbenchAdapter {
+ static class WorkbenchAdapter implements IWorkbenchAdapter {
@Override
public Object[] getChildren(Object o) {
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/registry/MarkerHelpRegistry.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/registry/MarkerHelpRegistry.java
index 9a8cb41..1c58f2c 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/registry/MarkerHelpRegistry.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/registry/MarkerHelpRegistry.java
@@ -70,7 +70,7 @@
*/
private static final String ATT_CLASS = "class"; //$NON-NLS-1$
- private class QueryComparator implements Comparator<MarkerQuery> {
+ private static class QueryComparator implements Comparator<MarkerQuery> {
@Override
public boolean equals(Object o) {
if (!(o instanceof QueryComparator)) {
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/registry/MarkerImageProviderRegistry.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/registry/MarkerImageProviderRegistry.java
index b3c435c..1509b1e 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/registry/MarkerImageProviderRegistry.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/registry/MarkerImageProviderRegistry.java
@@ -43,7 +43,7 @@
private ArrayList descriptors = new ArrayList();
- class Descriptor {
+ static class Descriptor {
String id;
String markerType;
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerCompletionField.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerCompletionField.java
index f9f40c1..6c26c5c 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerCompletionField.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerCompletionField.java
@@ -33,7 +33,7 @@
*/
public class MarkerCompletionField extends MarkerField {
- private class CompletionEditingSupport extends EditingSupport {
+ private static class CompletionEditingSupport extends EditingSupport {
private CheckboxCellEditor editor;
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerDescriptionField.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerDescriptionField.java
index 83b2deb..78c2c03 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerDescriptionField.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerDescriptionField.java
@@ -32,7 +32,7 @@
*/
public class MarkerDescriptionField extends MarkerField {
- private class DescriptionEditingSupport extends EditingSupport {
+ private static class DescriptionEditingSupport extends EditingSupport {
private TextCellEditor editor;
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerPriorityField.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerPriorityField.java
index 55331c6..560d94a 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerPriorityField.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerPriorityField.java
@@ -36,7 +36,7 @@
*/
public class MarkerPriorityField extends MarkerField {
- private class PriorityEditingSupport extends EditingSupport {
+ private static class PriorityEditingSupport extends EditingSupport {
private ComboBoxCellEditor editor;
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/QuickFixHandler.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/QuickFixHandler.java
index be7b56a..01911dd 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/QuickFixHandler.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/QuickFixHandler.java
@@ -49,7 +49,7 @@
*/
public class QuickFixHandler extends MarkerViewHandler {
- private class QuickFixWizardDialog extends WizardDialog {
+ private static class QuickFixWizardDialog extends WizardDialog {
/**
* @param parentShell
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/WizardProjectsImportPage.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/WizardProjectsImportPage.java
index 7bd580f..ff451c3 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/WizardProjectsImportPage.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/WizardProjectsImportPage.java
@@ -308,7 +308,7 @@
/**
* A filter to remove conflicting projects
*/
- class ConflictingProjectFilter extends ViewerFilter {
+ static class ConflictingProjectFilter extends ViewerFilter {
@Override
public boolean select(Viewer viewer, Object parentElement,
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/TypeMarkerGroup.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/TypeMarkerGroup.java
index 5692f0f..6a65c69 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/TypeMarkerGroup.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/TypeMarkerGroup.java
@@ -136,7 +136,7 @@
return (o1, o2) -> o1.getLabel().compareTo(o2.getLabel());
}
- private class TypesMarkerGroupingEntry extends MarkerGroupingEntry {
+ private static class TypesMarkerGroupingEntry extends MarkerGroupingEntry {
public TypesMarkerGroupingEntry(String label) {
super(label);
}
