Perform clean code of bundles/org.eclipse.ui.navigator

Author: eclipse-platform-bot

bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonNavigatorActionGroup.java

@@ -61,7 +61,7 @@ public class CommonNavigatorActionGroup extends ActionGroup implements IMementoA
 
 	private final CommonViewer commonViewer;
 
-	private CommonNavigator commonNavigator;
+	private final CommonNavigator commonNavigator;
 
 	private final LinkHelperService linkHelperService;
 

bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonNavigatorFrameSource.java

@@ -22,7 +22,7 @@
  */
 public class CommonNavigatorFrameSource extends TreeViewerFrameSource {
 
-	private CommonNavigator navigator;
+	private final CommonNavigator navigator;
 
 	/**
 	 * Constructs a new frame source for the specified common navigator.

bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonViewerSiteDelegate.java

@@ -27,9 +27,9 @@
 public class CommonViewerSiteDelegate implements ICommonViewerSite {
 
 
-	private String id;
+	private final String id;
 	private ISelectionProvider selectionProvider;
-	private Shell shell;
+	private final Shell shell;
 
 	public CommonViewerSiteDelegate(String anId,  ISelectionProvider aSelectionProvider, Shell aShell) {
 		Assert.isNotNull(anId);

bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonViewerSiteIEditorPartSiteDelegate.java

@@ -32,7 +32,7 @@
 public class CommonViewerSiteIEditorPartSiteDelegate implements
 		ICommonViewerWorkbenchSite {
 
-	private IEditorSite editorSite;
+	private final IEditorSite editorSite;
 
 	public CommonViewerSiteIEditorPartSiteDelegate(IEditorSite anEditorSite) {
 		editorSite = anEditorSite;

bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonViewerSiteIPageSiteDelegate.java

@@ -27,9 +27,9 @@
  */
 public class CommonViewerSiteIPageSiteDelegate implements ICommonViewerSite {
 
-	private IPageSite pageSite;
+	private final IPageSite pageSite;
 
-	private String viewerId;
+	private final String viewerId;
 
 	public CommonViewerSiteIPageSiteDelegate(String aViewerId,
 			IPageSite aPageSite) {

bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonViewerSiteIViewSiteDelegate.java

@@ -32,7 +32,7 @@
  */
 public class CommonViewerSiteIViewSiteDelegate implements ICommonViewerWorkbenchSite {
 
-	private IViewSite viewSite;
+	private final IViewSite viewSite;
 
 	public CommonViewerSiteIViewSiteDelegate(IViewSite aViewSite) {
 		viewSite = aViewSite;

bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/ContributorTrackingSet.java

@@ -34,7 +34,7 @@ public class ContributorTrackingSet extends LinkedHashSet {
 
 	private INavigatorContentDescriptor contributor;
 	private INavigatorContentDescriptor firstClassContributor;
-	private NavigatorContentService contentService;
+	private final NavigatorContentService contentService;
 
 	/**
 	 * Construct a tracking set.
@@ -71,8 +71,9 @@ public boolean remove(Object o) {
 	@Override
 	public void clear() {
 		Iterator it = iterator();
-		while (it.hasNext())
+		while (it.hasNext()) {
 			contentService.forgetContribution(it.next());
+		}
 		super.clear();
 	}
 
@@ -104,8 +105,9 @@ public void setContributor(INavigatorContentDescriptor newContributor, INavigato
 
 	public void setContents(Object[] contents) {
 		super.clear();
-		if(contents != null)
+		if(contents != null) {
 			addAll(Arrays.asList(contents));
+		}
 
 	}
 

bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CustomAndExpression.java

@@ -45,8 +45,9 @@ public CustomAndExpression(IConfigurationElement element) {
 		Assert.isNotNull(element);
 
 		final IConfigurationElement[] children = element.getChildren();
-		if (children.length == 0)
+		if (children.length == 0) {
 			return;
+		}
 		SafeRunner.run(new NavigatorSafeRunnable() {
 			@Override
 			public void run() throws Exception {

bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorActivationService.java

@@ -68,7 +68,7 @@ public final class NavigatorActivationService implements
 
 	private final ListenerList<IExtensionActivationListener> listeners = new ListenerList<>();
 
-	private INavigatorContentService contentService;
+	private final INavigatorContentService contentService;
 
 	/**
 	 * Create an instance of the service.
@@ -94,16 +94,19 @@ public NavigatorActivationService(INavigatorContentService aContentService) {
 	@Override
 	public boolean isNavigatorExtensionActive(String aNavigatorExtensionId) {
 		Boolean b = activatedExtensionsMap.get(aNavigatorExtensionId);
-		if(b != null)
+		if(b != null) {
 			return b.booleanValue();
+		}
 		synchronized (activatedExtensionsMap) {
 			NavigatorContentDescriptor descriptor = CONTENT_DESCRIPTOR_REGISTRY.getContentDescriptor(aNavigatorExtensionId);
-			if (descriptor == null)
+			if (descriptor == null) {
 				return false;
-			if(descriptor.isActiveByDefault())
+			}
+			if(descriptor.isActiveByDefault()) {
 				activatedExtensionsMap.put(aNavigatorExtensionId, Boolean.TRUE);
-			else
+			} else {
 				activatedExtensionsMap.put(aNavigatorExtensionId, Boolean.FALSE);
+			}
 			return descriptor.isActiveByDefault();
 		}
 	}
@@ -241,8 +244,9 @@ private void notifyListeners(String[] navigatorExtensionIds,
 			boolean toEnable) {
 
 		if(navigatorExtensionIds != null) { // should really never be null, but just in case
-			if(navigatorExtensionIds.length > 1)
+			if(navigatorExtensionIds.length > 1) {
 				Arrays.sort(navigatorExtensionIds);
+			}
 
 			for (IExtensionActivationListener element : listeners) {
 				element.onExtensionActivation(contentService.getViewerId(), navigatorExtensionIds, toEnable);
@@ -275,8 +279,9 @@ private void revertExtensionActivations() {
 				} else {
 					// IS THIS THE RIGHT WAY TO HANDLE THIS CASE?
 					NavigatorContentDescriptor descriptor = CONTENT_DESCRIPTOR_REGISTRY.getContentDescriptor(contentExtensionId);
-					if(descriptor != null)
+					if(descriptor != null) {
 						activatedExtensionsMap.put(id, Boolean.valueOf(descriptor.isActiveByDefault()));
+					}
 				}
 			}
 

bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentService.java

@@ -123,8 +123,8 @@ public class NavigatorContentService implements IExtensionActivationListener,
 	 * to record the object/description associations which are when stored
 	 * in the Tree associated with the viewer.
 	 */
-	private Map<Object, INavigatorContentDescriptor> contributionMemory;
-	private Map<Object, INavigatorContentDescriptor> contributionMemoryFirstClass;
+	private final Map<Object, INavigatorContentDescriptor> contributionMemory;
+	private final Map<Object, INavigatorContentDescriptor> contributionMemoryFirstClass;
 
 	private ILabelProvider labelProvider;
 
@@ -338,8 +338,9 @@ protected void updateService(Viewer aViewer, Object anOldInput, Object aNewInput
 		// Prevents the world from being started again once we have been disposed.  In
 		// the dispose process, the ContentViewer will call setInput() on the
 		// NavigatorContentServiceContentProvider, which gets us here
-		if (isDisposed)
+		if (isDisposed) {
 			return;
+		}
 		NavigatorContentDescriptorManager.getInstance().clearCache();
 		synchronized (this) {
 			if (structuredViewerManager == null) {
@@ -579,8 +580,9 @@ public INavigatorContentExtension getContentExtensionById(
 			String anExtensionId) {
 		NavigatorContentDescriptor descriptor = CONTENT_DESCRIPTOR_REGISTRY
 				.getContentDescriptor(anExtensionId);
-		if (descriptor != null)
+		if (descriptor != null) {
 			return getExtension(descriptor);
+		}
 		return null;
 	}
 
@@ -667,9 +669,10 @@ public void rememberContribution(INavigatorContentDescriptor source,
 		synchronized (this) {
 			if (contributionMemory.get(element) == null
 					|| contributionMemoryFirstClass.get(element) == firstClassSource) {
-				if (Policy.DEBUG_RESOLUTION)
+				if (Policy.DEBUG_RESOLUTION) {
 					System.out
 							.println("rememberContribution: " + Policy.getObjectString(element) + " source: " + source); //$NON-NLS-1$//$NON-NLS-2$
+				}
 				contributionMemory.put(element, source);
 				contributionMemoryFirstClass.put(element, firstClassSource);
 			}
@@ -719,17 +722,20 @@ public int getContributionMemorySize() {
 	 * @see #findContentExtensionsByTriggerPoint(Object)
 	 */
 	public synchronized NavigatorContentDescriptor getSourceOfContribution(Object element) {
-		if (element == null)
+		if (element == null) {
 			return null;
-		if (structuredViewerManager == null)
+		}
+		if (structuredViewerManager == null) {
 			return null;
+		}
 		// Try here first because it might not yet be in the tree
 		NavigatorContentDescriptor src;
 		synchronized (this) {
 			src = (NavigatorContentDescriptor) contributionMemory.get(element);
 		}
-		if (src != null)
+		if (src != null) {
 			return src;
+		}
 		return (NavigatorContentDescriptor) structuredViewerManager.getData(element);
 	}
 	public static final boolean CONSIDER_OVERRIDES = true;