diff --git a/bundles/org.eclipse.ui.navigator/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.navigator/META-INF/MANIFEST.MF index 20061f08424..e2e43916920 100644 --- a/bundles/org.eclipse.ui.navigator/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.ui.navigator/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Plugin.name Bundle-SymbolicName: org.eclipse.ui.navigator; singleton:=true -Bundle-Version: 3.13.200.qualifier +Bundle-Version: 3.13.300.qualifier Bundle-Activator: org.eclipse.ui.internal.navigator.NavigatorPlugin Bundle-Vendor: %Plugin.providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonNavigatorActionGroup.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonNavigatorActionGroup.java index 905853720c8..921aef9409a 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonNavigatorActionGroup.java +++ b/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; diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonNavigatorFrameSource.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonNavigatorFrameSource.java index 7e447f21118..36f413204b9 100755 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonNavigatorFrameSource.java +++ b/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. diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonViewerSiteDelegate.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonViewerSiteDelegate.java index ed01ccb540d..b1217e6d2f4 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonViewerSiteDelegate.java +++ b/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); diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonViewerSiteIEditorPartSiteDelegate.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonViewerSiteIEditorPartSiteDelegate.java index 7ca4d937ccc..943a23912dc 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonViewerSiteIEditorPartSiteDelegate.java +++ b/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; diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonViewerSiteIPageSiteDelegate.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonViewerSiteIPageSiteDelegate.java index 08c7df67bca..1776c352604 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonViewerSiteIPageSiteDelegate.java +++ b/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) { diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonViewerSiteIViewSiteDelegate.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonViewerSiteIViewSiteDelegate.java index 157763a3a0b..96c433dc726 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonViewerSiteIViewSiteDelegate.java +++ b/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; diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/ContributorTrackingSet.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/ContributorTrackingSet.java index a47f518e1cf..460e08aeb48 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/ContributorTrackingSet.java +++ b/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)); + } } diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CustomAndExpression.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CustomAndExpression.java index 0e8879c1bf5..7ecdf415e77 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CustomAndExpression.java +++ b/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 { diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorActivationService.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorActivationService.java index 5058337aef2..4a1a96dccd8 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorActivationService.java +++ b/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 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())); + } } } diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentService.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentService.java index 51cf8ff2d35..ce0cea57ac2 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentService.java +++ b/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 contributionMemory; - private Map contributionMemoryFirstClass; + private final Map contributionMemory; + private final Map 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; diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceContentProvider.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceContentProvider.java index af400de3305..538d1777e0d 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceContentProvider.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceContentProvider.java @@ -151,12 +151,13 @@ private Object[] internalGetChildren(final Object aParentElement, public void run() throws Exception { if (!isOverridingExtensionInSet(foundExtension.getDescriptor(), enabledExtensions)) { - if (elements) + if (elements) { contributedChildren = foundExtension.internalGetContentProvider() .getElements(aParentElementOrPath); - else + } else { contributedChildren = foundExtension.internalGetContentProvider() .getChildren(aParentElementOrPath); + } overridingExtensions = foundExtension .getOverridingExtensionsForTriggerPoint(aParentElement); INavigatorContentDescriptor foundDescriptor = foundExtension @@ -494,8 +495,7 @@ public void dispose() { * @return the element */ private Object internalAsElement(Object parentElementOrPath) { - if (parentElementOrPath instanceof TreePath) { - TreePath tp = (TreePath) parentElementOrPath; + if (parentElementOrPath instanceof TreePath tp) { if (tp.getSegmentCount() > 0) { return tp.getLastSegment(); } @@ -605,10 +605,11 @@ private Set findPaths(TreePathCompiler aPathCompiler) { String msg = cpe.getMessage() != null ? cpe.getMessage() : cpe.toString(); NavigatorPlugin.logError(0, msg, cpe); } - if (foundPaths.isEmpty()) + if (foundPaths.isEmpty()) { parentPaths.add(c); - else + } else { parentPaths.addAll(foundPaths); + } } } return parentPaths; @@ -638,15 +639,17 @@ public void run() throws Exception { for (TreePath parentTreePath : parentTreePaths) { parent = parentTreePath.getLastSegment(); - if ((parent = findParent(foundExtension, anElement, parent)) != null) + if ((parent = findParent(foundExtension, anElement, parent)) != null) { parents.add(parent); + } } } else { parent = foundExtension.internalGetContentProvider().getParent( anElement); - if ((parent = findParent(foundExtension, anElement, parent)) != null) + if ((parent = findParent(foundExtension, anElement, parent)) != null) { parents.add(parent); + } } } } @@ -678,8 +681,9 @@ private Object findParent(NavigatorContentExtension anExtension, Object anElemen piplineContentProvider = overridingExtension.internalGetContentProvider(); suggestedOverriddenParent = piplineContentProvider.getPipelinedParent(anElement, lastValidParent); - if (suggestedOverriddenParent != null && !suggestedOverriddenParent.equals(aSuggestedParent)) + if (suggestedOverriddenParent != null && !suggestedOverriddenParent.equals(aSuggestedParent)) { lastValidParent = suggestedOverriddenParent; + } // should never return null lastValidParent = findParent(overridingExtension, anElement, lastValidParent); diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceDescriptionProvider.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceDescriptionProvider.java index 5a7ae6545f1..09d4711a304 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceDescriptionProvider.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceDescriptionProvider.java @@ -46,9 +46,8 @@ public String getDescription(Object anElement) { Object target; - if (anElement instanceof IStructuredSelection) { + if (anElement instanceof IStructuredSelection structuredSelection) { - IStructuredSelection structuredSelection = (IStructuredSelection) anElement; if (structuredSelection.size() > 1) { return getDefaultStatusBarMessage(structuredSelection.size()); } diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceLabelProvider.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceLabelProvider.java index 5cfccfa8787..a335c5eefb3 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceLabelProvider.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceLabelProvider.java @@ -133,16 +133,19 @@ public String getText(Object anElement) { @Override public String getColumnText(Object anElement, int aColumn) { ILabelProvider[] labelProviders = contentService.findRelevantLabelProviders(anElement); - if (labelProviders.length == 0) + if (labelProviders.length == 0) { return NLS.bind(CommonNavigatorMessages.NavigatorContentServiceLabelProvider_Error_no_label_provider_for_0_, makeSmallString(anElement)); + } String text = null; for (ILabelProvider labelProvider : labelProviders) { - if (labelProvider instanceof ITableLabelProvider && aColumn != -1) + if (labelProvider instanceof ITableLabelProvider && aColumn != -1) { text = ((ITableLabelProvider)labelProvider).getColumnText(anElement, aColumn); - else + } else { text = labelProvider.getText(anElement); - if (text != null && text.length() > 0) + } + if (text != null && text.length() > 0) { return text; + } } return text; } @@ -150,8 +153,9 @@ public String getColumnText(Object anElement, int aColumn) { @Override public StyledString getStyledText(Object anElement) { Collection extensions = contentService.findPossibleLabelExtensions(anElement); - if (extensions.isEmpty()) + if (extensions.isEmpty()) { return new StyledString(NLS.bind(CommonNavigatorMessages.NavigatorContentServiceLabelProvider_Error_no_label_provider_for_0_, makeSmallString(anElement))); + } StyledString text = null; for (Iterator itr = extensions.iterator(); itr.hasNext() && text == null; ) { @@ -184,8 +188,9 @@ private StyledString findStyledText(NavigatorContentExtension foundExtension, Ob } private String makeSmallString(Object obj) { - if (obj == null) + if (obj == null) { return "null"; //$NON-NLS-1$ + } String str = obj.toString(); int len = str.length(); return str.substring(0, len < 50 ? len : 49); @@ -198,10 +203,11 @@ private String makeSmallString(Object obj) { private Image findImage(NavigatorContentExtension foundExtension, Object anElement, int aColumn) { Image image = null; ICommonLabelProvider provider = foundExtension.getLabelProvider(); - if (provider instanceof ITableLabelProvider && aColumn >= 0) + if (provider instanceof ITableLabelProvider && aColumn >= 0) { image = ((ITableLabelProvider)provider).getColumnImage(anElement, aColumn); - else + } else { image = provider.getImage(anElement); + } return image; } @@ -210,8 +216,7 @@ private Image findImage(NavigatorContentExtension foundExtension, Object anEleme public Font getFont(Object anElement) { ILabelProvider[] labelProviders = contentService.findRelevantLabelProviders(anElement); for (ILabelProvider provider : labelProviders) { - if (provider instanceof IFontProvider) { - IFontProvider fontProvider = (IFontProvider) provider; + if (provider instanceof IFontProvider fontProvider) { Font font = fontProvider.getFont(anElement); if (font != null) { return font; @@ -225,8 +230,7 @@ public Font getFont(Object anElement) { public Color getForeground(Object anElement) { ILabelProvider[] labelProviders = contentService.findRelevantLabelProviders(anElement); for (ILabelProvider provider : labelProviders) { - if (provider instanceof IColorProvider) { - IColorProvider colorProvider = (IColorProvider) provider; + if (provider instanceof IColorProvider colorProvider) { Color color = colorProvider.getForeground(anElement); if (color != null) { return color; @@ -240,8 +244,7 @@ public Color getForeground(Object anElement) { public Color getBackground(Object anElement) { ILabelProvider[] labelProviders = contentService.findRelevantLabelProviders(anElement); for (ILabelProvider provider : labelProviders) { - if (provider instanceof IColorProvider) { - IColorProvider colorProvider = (IColorProvider) provider; + if (provider instanceof IColorProvider colorProvider) { Color color = colorProvider.getBackground(anElement); if (color != null) { return color; @@ -255,8 +258,7 @@ public Color getBackground(Object anElement) { public String getToolTipText(Object anElement) { ILabelProvider[] labelProviders = contentService.findRelevantLabelProviders(anElement); for (ILabelProvider provider : labelProviders) { - if (provider instanceof IToolTipProvider) { - IToolTipProvider tooltipProvider = (IToolTipProvider) provider; + if (provider instanceof IToolTipProvider tooltipProvider) { String tooltip = tooltipProvider.getToolTipText(anElement); if (tooltip != null && !tooltip.isEmpty()) { return tooltip; @@ -379,8 +381,7 @@ public void updateLabel(ViewerLabel label, TreePath elementPath) { private void findUpdateLabel(NavigatorContentExtension foundExtension, ReusableViewerLabel label, TreePath elementPath) { ILabelProvider labelProvider = foundExtension.getLabelProvider(); - if (labelProvider instanceof ITreePathLabelProvider) { - ITreePathLabelProvider tplp = (ITreePathLabelProvider) labelProvider; + if (labelProvider instanceof ITreePathLabelProvider tplp) { tplp.updateLabel(label, elementPath); } else { label.setImage(labelProvider.getImage(elementPath.getLastSegment())); diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorDecoratingLabelProvider.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorDecoratingLabelProvider.java index a4f03871e04..7cfe0e7cb7d 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorDecoratingLabelProvider.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorDecoratingLabelProvider.java @@ -69,8 +69,9 @@ public StyledString getStyledText(Object element) { return ((IStyledLabelProvider) provider).getStyledText(element); } String text= provider.getText(element); - if (text == null) + if (text == null) { text= ""; //$NON-NLS-1$ + } return new StyledString(text); } diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorExtensionStateService.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorExtensionStateService.java index 41b06529590..a5c0a4db296 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorExtensionStateService.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorExtensionStateService.java @@ -34,7 +34,7 @@ public class NavigatorExtensionStateService { private final Object lock = new Object(); - private INavigatorContentService contentService; + private final INavigatorContentService contentService; /** * Create an ExtensionStateServie that will keep track of the state models @@ -64,9 +64,10 @@ public IExtensionStateModel getExtensionStateModel( synchronized (lock) { IExtensionStateModel model = (IExtensionStateModel) stateModels .get(aDescriptor); - if (model == null) + if (model == null) { stateModels.put(aDescriptor, model = new ExtensionStateModel( aDescriptor.getId(), contentService.getViewerId())); + } return model; } } diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorFilterService.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorFilterService.java index 3373baefd4e..9244b15b82e 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorFilterService.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorFilterService.java @@ -254,8 +254,9 @@ public void activateFilterIdsAndUpdateViewer(String[] filterIdsToActivate) { // We don't turn of non-UI visible filters here, they have to be manipulated // explicitly if (!visibleFilterDescriptor.isVisibleInUi()) { - if (nonUiVisible == null) + if (nonUiVisible == null) { nonUiVisible = new ArrayList<>(); + } nonUiVisible.add(visibleFilterDescriptor.getId()); } } @@ -310,10 +311,11 @@ public void setActive(String aFilterId, boolean toMakeActive) { synchronized (activeFilters) { boolean isActive = activeFilters.contains(aFilterId); if(isActive ^ toMakeActive) { - if(toMakeActive) + if(toMakeActive) { activeFilters.add(aFilterId); - else + } else { activeFilters.remove(aFilterId); + } } diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorPipelineService.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorPipelineService.java index 4e45784a0fc..9dbba364bee 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorPipelineService.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorPipelineService.java @@ -33,7 +33,7 @@ */ public class NavigatorPipelineService implements INavigatorPipelineService { - private NavigatorContentService contentService; + private final NavigatorContentService contentService; /** * Create a pipeline assistant for the given content service. @@ -115,8 +115,9 @@ public PipelinedShapeModification interceptRemove( } } - for (Iterator overridingExtensionsIter = interestedExtensions.iterator(); overridingExtensionsIter.hasNext();) + for (Iterator overridingExtensionsIter = interestedExtensions.iterator(); overridingExtensionsIter.hasNext();) { pipelineInterceptRemove(aRemoveModification, trackedSet, (NavigatorContentExtension) overridingExtensionsIter.next()); + } return aRemoveModification; } @@ -151,8 +152,9 @@ public void handleException(Throwable e) { }); } trackedSet.setContributor(null, null); - if (overridingExtension.getDescriptor().hasOverridingExtensions()) + if (overridingExtension.getDescriptor().hasOverridingExtensions()) { pipelineInterceptRemove(aRemoveModification, trackedSet, overridingExtension); + } } } @@ -192,9 +194,10 @@ public void run() throws Exception { .internalGetContentProvider() .interceptRefresh(aRefreshSynchronization); - if (nceLocal.getDescriptor().hasOverridingExtensions()) + if (nceLocal.getDescriptor().hasOverridingExtensions()) { intercepted[0] |= pipelineInterceptRefresh(nceLocal, aRefreshSynchronization, refreshable); + } } @Override @@ -245,9 +248,10 @@ public void run() throws Exception { .internalGetContentProvider() .interceptUpdate(anUpdateSynchronization); - if (nceLocal.getDescriptor().hasOverridingExtensions()) + if (nceLocal.getDescriptor().hasOverridingExtensions()) { intercepted[0] |= pipelineInterceptUpdate(nceLocal, anUpdateSynchronization, refreshable); + } } @Override diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorPlugin.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorPlugin.java index 085cbeb7b76..a9c963f50ae 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorPlugin.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorPlugin.java @@ -65,7 +65,7 @@ public class NavigatorPlugin extends AbstractUIPlugin { private static class LogJob extends Job { - private ListenerList messages = new ListenerList() { + private final ListenerList messages = new ListenerList() { @Override public synchronized Object[] getListeners() { @@ -111,7 +111,7 @@ public void log(IStatus mesg) { /** The id of the orge.eclipse.ui.navigator plugin. */ public static String PLUGIN_ID = "org.eclipse.ui.navigator"; //$NON-NLS-1$ - private BundleListener bundleListener = NavigatorSaveablesService::bundleChanged; + private final BundleListener bundleListener = NavigatorSaveablesService::bundleChanged; /** * This constant can be used via {@link CommonViewer#setData(String, Object)} to set/get the lisst diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorSafeRunnable.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorSafeRunnable.java index a14d0153ea7..eba61b6b094 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorSafeRunnable.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorSafeRunnable.java @@ -55,8 +55,9 @@ public NavigatorSafeRunnable(IConfigurationElement element, Object object) { @Override public void handleException(Throwable e) { String msg = _message; - if (msg == null) + if (msg == null) { msg = e.getMessage() != null ? e.getMessage() : e.toString(); + } if (_element != null) { msg += ": " + //$NON-NLS-1$ NLS.bind(CommonNavigatorMessages.Exception_Invoking_Extension, new Object[] { diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorSaveablesService.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorSaveablesService.java index a6783f96975..bac07776097 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorSaveablesService.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorSaveablesService.java @@ -106,8 +106,9 @@ public void handleLifecycleEvent(SaveablesLifecycleEvent event) { // synchronize in the same order as in the init method. synchronized (instances) { synchronized (NavigatorSaveablesService.this) { - if (isDisposed()) + if (isDisposed()) { return; + } switch (event.getEventType()) { case SaveablesLifecycleEvent.POST_OPEN: recomputeSaveablesAndNotify(false, null); @@ -410,8 +411,9 @@ public synchronized Saveable[] getSaveables() { private SaveablesProvider[] getSaveablesProviders() { // TODO optimize this if (saveablesProviders == null) { - if (isDisposed()) + if (isDisposed()) { return null; + } inactivePluginsWithSaveablesProviders = new HashMap<>(); saveablesProviderMap = new TreeMap<>(ExtensionSequenceNumberComparator.INSTANCE); INavigatorContentDescriptor[] descriptors = contentService diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorSiteEditor.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorSiteEditor.java index 8a801b191b8..6333a6d4917 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorSiteEditor.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorSiteEditor.java @@ -36,13 +36,13 @@ */ public class NavigatorSiteEditor implements INavigatorSiteEditor { - private Tree navigatorTree; - private TreeEditor treeEditor; + private final Tree navigatorTree; + private final TreeEditor treeEditor; private Text textEditor; private Composite textEditorParent; private TextActionHandler textActionHandler; private String text; // the text being edited - private CommonViewer commonViewer; + private final CommonViewer commonViewer; /** diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/Policy.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/Policy.java index 63deaa5fdf9..50c2fd4b9f8 100755 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/Policy.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/Policy.java @@ -68,11 +68,13 @@ private static boolean getDebugOption(String option) { * @return a String */ public static String getObjectString(Object obj) { - if (obj == null) + if (obj == null) { return "(null)"; //$NON-NLS-1$ + } String elemStr = obj.toString(); - if (elemStr.length() > 30) + if (elemStr.length() > 30) { elemStr = elemStr.substring(0, 29); + } return "(" + obj.getClass().getName() + "): " + elemStr; //$NON-NLS-1$//$NON-NLS-2$ } diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/ReusableViewerLabel.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/ReusableViewerLabel.java index 77506d4b093..915ef407d69 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/ReusableViewerLabel.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/ReusableViewerLabel.java @@ -68,10 +68,12 @@ public boolean hasChanged() { boolean changed = false; if(original != null) { - if(original.getText() == null ^ getText() != null) + if(original.getText() == null ^ getText() != null) { changed |= getText() != null; - if(original.getText() != null && getImage() != null) + } + if(original.getText() != null && getImage() != null) { changed |= !getImage().equals(original.getImage()); + } } return changed; } diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/TextActionHandler.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/TextActionHandler.java index af530a2a897..faddaaa823f 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/TextActionHandler.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/TextActionHandler.java @@ -46,15 +46,15 @@ * */ public class TextActionHandler { - private DeleteActionHandler textDeleteAction = new DeleteActionHandler(); + private final DeleteActionHandler textDeleteAction = new DeleteActionHandler(); - private CutActionHandler textCutAction = new CutActionHandler(); + private final CutActionHandler textCutAction = new CutActionHandler(); - private CopyActionHandler textCopyAction = new CopyActionHandler(); + private final CopyActionHandler textCopyAction = new CopyActionHandler(); - private PasteActionHandler textPasteAction = new PasteActionHandler(); + private final PasteActionHandler textPasteAction = new PasteActionHandler(); - private SelectAllActionHandler textSelectAllAction = new SelectAllActionHandler(); + private final SelectAllActionHandler textSelectAllAction = new SelectAllActionHandler(); private IAction deleteAction; @@ -66,33 +66,33 @@ public class TextActionHandler { private IAction selectAllAction; - private IPropertyChangeListener deleteActionListener = new PropertyChangeListener( + private final IPropertyChangeListener deleteActionListener = new PropertyChangeListener( textDeleteAction); - private IPropertyChangeListener cutActionListener = new PropertyChangeListener( + private final IPropertyChangeListener cutActionListener = new PropertyChangeListener( textCutAction); - private IPropertyChangeListener copyActionListener = new PropertyChangeListener( + private final IPropertyChangeListener copyActionListener = new PropertyChangeListener( textCopyAction); - private IPropertyChangeListener pasteActionListener = new PropertyChangeListener( + private final IPropertyChangeListener pasteActionListener = new PropertyChangeListener( textPasteAction); - private IPropertyChangeListener selectAllActionListener = new PropertyChangeListener( + private final IPropertyChangeListener selectAllActionListener = new PropertyChangeListener( textSelectAllAction); - private Listener textControlListener = new TextControlListener(); + private final Listener textControlListener = new TextControlListener(); private Text activeTextControl; - private MouseAdapter mouseAdapter = new MouseAdapter() { + private final MouseAdapter mouseAdapter = new MouseAdapter() { @Override public void mouseUp(MouseEvent e) { updateActionsEnableState(); } }; - private KeyAdapter keyAdapter = new KeyAdapter() { + private final KeyAdapter keyAdapter = new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { updateActionsEnableState(); @@ -118,7 +118,7 @@ public void handleEvent(Event event) { } private class PropertyChangeListener implements IPropertyChangeListener { - private IAction actionHandler; + private final IAction actionHandler; protected PropertyChangeListener(IAction actionHandler) { super(); diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/actions/CommonActionDescriptorManager.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/actions/CommonActionDescriptorManager.java index 7b8eb0bb61e..406f12926ef 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/actions/CommonActionDescriptorManager.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/actions/CommonActionDescriptorManager.java @@ -97,8 +97,9 @@ protected void addActionDescriptor( private int findId(List list, String id) { for (int i= 0, len = list.size(); i< len; i++) { CommonActionProviderDescriptor desc = list.get(i); - if (desc.getId().equals(id)) + if (desc.getId().equals(id)) { return i; + } } return -1; } @@ -254,8 +255,9 @@ private boolean addProviderIfRelevant( for (Iterator iter = actionDescriptor.overridingDescriptors(); iter.hasNext();) { CommonActionProviderDescriptor descriptor = (CommonActionProviderDescriptor) iter.next(); if(addProviderIfRelevant(aContentService, structuredSelection, descriptor, providers, blockedProviders)) { - while(iter.hasNext()) + while(iter.hasNext()) { blockedProviders.add(iter.next()); + } return true; } @@ -338,10 +340,10 @@ protected boolean readElement(IConfigurationElement anElement) { private class AddProviderSafeRunner implements ISafeRunnable { - private IConfigurationElement parentElement; - private IConfigurationElement defaultEnablement; - private IConfigurationElement actionProvider; - private Priority defaultPriority; + private final IConfigurationElement parentElement; + private final IConfigurationElement defaultEnablement; + private final IConfigurationElement actionProvider; + private final Priority defaultPriority; protected AddProviderSafeRunner(IConfigurationElement actionProvider, IConfigurationElement defaultEnablement, diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/actions/CommonActionProviderDescriptor.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/actions/CommonActionProviderDescriptor.java index b2f47aa18b4..947ec651bfd 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/actions/CommonActionProviderDescriptor.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/actions/CommonActionProviderDescriptor.java @@ -152,10 +152,11 @@ private void init() { if(priority == null) { String prio = configurationElement.getAttribute(ATT_PRIORITY); - if(prio != null) + if(prio != null) { priority = Priority.get(prio); - else + } else { priority = Priority.NORMAL; + } } IConfigurationElement[] children = configurationElement @@ -202,8 +203,9 @@ public void run() throws Exception { } }); - if (provider[0] != null) + if (provider[0] != null) { return provider[0]; + } hasLoadingFailed = true; return SkeletonActionProvider.INSTANCE; } @@ -342,12 +344,15 @@ public int hashCode() { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (!super.equals(obj)) + } + if (!super.equals(obj)) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } final CommonActionProviderDescriptor other = (CommonActionProviderDescriptor) obj; return Objects.equals(definedId, other.definedId) && Objects.equals(visibilityId, other.visibilityId); } @@ -423,20 +428,25 @@ public static class CommonActionProviderDescriptorCompator implements Comparator public int compare(Object o1, Object o2) { CommonActionProviderDescriptor lvalue= null, rvalue= null; - if(o1 instanceof CommonActionProviderDescriptor) + if(o1 instanceof CommonActionProviderDescriptor) { lvalue = (CommonActionProviderDescriptor) o1; + } - if(o2 instanceof CommonActionProviderDescriptor) + if(o2 instanceof CommonActionProviderDescriptor) { rvalue = (CommonActionProviderDescriptor) o2; + } - if(lvalue == null || rvalue == null) + if(lvalue == null || rvalue == null) { return LESS_THAN; - if(lvalue.equals(rvalue)) + } + if(lvalue.equals(rvalue)) { return EQUALS; + } int comparison = lvalue.getPriority().getValue() - rvalue.getPriority().getValue(); - if(comparison == 0) + if(comparison == 0) { return lvalue.getDefinedId().compareTo(rvalue.getDefinedId()); + } return comparison; } diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/actions/LinkEditorAction.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/actions/LinkEditorAction.java index f9e94279cab..69f6ef1a69e 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/actions/LinkEditorAction.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/actions/LinkEditorAction.java @@ -58,7 +58,7 @@ public class LinkEditorAction extends Action implements ISelectionChangedListene private boolean ignoreSelectionChanged; private boolean ignoreEditorActivation; - private UIJob activateEditorJob = new UIJob(CommonNavigatorMessages.Link_With_Editor_Job_) { + private final UIJob activateEditorJob = new UIJob(CommonNavigatorMessages.Link_With_Editor_Job_) { @Override public IStatus runInUIThread(IProgressMonitor monitor) { @@ -85,7 +85,7 @@ public void run() throws Exception { } }; - private UIJob updateSelectionJob = new UIJob(CommonNavigatorMessages.Link_With_Editor_Job_) { + private final UIJob updateSelectionJob = new UIJob(CommonNavigatorMessages.Link_With_Editor_Job_) { @Override public IStatus runInUIThread(IProgressMonitor monitor) { diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/dnd/CommonDropAdapterDescriptor.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/dnd/CommonDropAdapterDescriptor.java index 9e92c55a47f..061478010c8 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/dnd/CommonDropAdapterDescriptor.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/dnd/CommonDropAdapterDescriptor.java @@ -108,8 +108,9 @@ public void run() throws Exception { .createExecutableExtension(ATT_CLASS); } }); - if (retValue[0] != null) + if (retValue[0] != null) { return retValue[0]; + } return SkeletonCommonDropAssistant.INSTANCE; } diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/dnd/NavigatorDnDService.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/dnd/NavigatorDnDService.java index ad9db35949d..c7ec8b78457 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/dnd/NavigatorDnDService.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/dnd/NavigatorDnDService.java @@ -48,7 +48,7 @@ public class NavigatorDnDService implements INavigatorDnDService { private static final CommonDropAdapterAssistant[] NO_ASSISTANTS = new CommonDropAdapterAssistant[0]; - private INavigatorContentService contentService; + private final INavigatorContentService contentService; private CommonDragAdapterAssistant[] dragAssistants; @@ -77,8 +77,9 @@ public void setDropAdaptor(CommonDropAdapter da) { @Override public synchronized CommonDragAdapterAssistant[] getCommonDragAssistants() { - if (dragAssistants == null) + if (dragAssistants == null) { initializeDragAssistants(); + } return dragAssistants; } @@ -98,8 +99,9 @@ private void initializeDragAssistants() { @Override public synchronized void bindDragAssistant(CommonDragAdapterAssistant anAssistant) { - if(dragAssistants == null) + if(dragAssistants == null) { initializeDragAssistants(); + } CommonDragAdapterAssistant[] newDragAssistants = new CommonDragAdapterAssistant[dragAssistants.length + 1]; System.arraycopy(dragAssistants, 0, newDragAssistants, 0, dragAssistants.length); newDragAssistants[dragAssistants.length] = anAssistant; @@ -180,10 +182,12 @@ private CommonDropAdapterAssistant[] sortAssistants(CommonDropAdapterAssistant[] // always be first on the list of drop assistant, if a conflict ever // occurs. String id = "org.eclipse.ui.navigator.resources."; //$NON-NLS-1$ - if (a.getClass().getName().startsWith(id)) + if (a.getClass().getName().startsWith(id)) { return -1; - if (b.getClass().getName().startsWith(id)) + } + if (b.getClass().getName().startsWith(id)) { return 1; + } return a.getClass().getName().compareTo(b.getClass().getName()); }); return array; diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/Binding.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/Binding.java index ee1fc6e7e75..e16a83c7426 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/Binding.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/Binding.java @@ -135,14 +135,11 @@ void consumeIncludes(IConfigurationElement element, boolean toRespectRoots) { NLS .bind( CommonNavigatorMessages.Attribute_Missing_Warning, - new Object[] { - NavigatorViewerDescriptor.ATT_PATTERN, - element - .getDeclaringExtension() - .getUniqueIdentifier(), - element - .getDeclaringExtension() - .getContributor().getName() }), + NavigatorViewerDescriptor.ATT_PATTERN, element + .getDeclaringExtension() + .getUniqueIdentifier(), element + .getDeclaringExtension() + .getContributor().getName()), null); } else { compiledPattern = Pattern.compile(patternString); @@ -174,14 +171,11 @@ void consumeExcludes(IConfigurationElement element) { NLS .bind( CommonNavigatorMessages.Attribute_Missing_Warning, - new Object[] { - NavigatorViewerDescriptor.ATT_PATTERN, - element - .getDeclaringExtension() - .getUniqueIdentifier(), - element - .getDeclaringExtension() - .getContributor().getName() }), + NavigatorViewerDescriptor.ATT_PATTERN, element + .getDeclaringExtension() + .getUniqueIdentifier(), element + .getDeclaringExtension() + .getContributor().getName()), null); } else { compiledPattern = Pattern.compile(patternString); diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/CommonActionExtensionSite.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/CommonActionExtensionSite.java index 1d7c8b4ce78..fa6f987001c 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/CommonActionExtensionSite.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/CommonActionExtensionSite.java @@ -37,13 +37,13 @@ public final class CommonActionExtensionSite extends CommonExtensionSite implements ICommonActionExtensionSite { - private String extensionId; + private final String extensionId; - private String pluginId; + private final String pluginId; - private ICommonViewerSite commonViewerSite; + private final ICommonViewerSite commonViewerSite; - private StructuredViewer structuredViewer; + private final StructuredViewer structuredViewer; /** * Create a config element for the initialization of Common Action diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/CommonContentExtensionSite.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/CommonContentExtensionSite.java index bf055379d65..cffa821a875 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/CommonContentExtensionSite.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/CommonContentExtensionSite.java @@ -26,11 +26,11 @@ public class CommonContentExtensionSite extends CommonExtensionSite implements ICommonContentExtensionSite { - private NavigatorContentExtension extension; + private final NavigatorContentExtension extension; - private IMemento memento; + private final IMemento memento; - private NavigatorContentService contentService; + private final NavigatorContentService contentService; /** * Create a config element for the initialization of Content Extensions. diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/CommonDragAssistantDescriptor.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/CommonDragAssistantDescriptor.java index d6ff2000852..1673314bc89 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/CommonDragAssistantDescriptor.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/CommonDragAssistantDescriptor.java @@ -28,7 +28,7 @@ */ public final class CommonDragAssistantDescriptor implements IViewerExtPtConstants { - private IConfigurationElement element; + private final IConfigurationElement element; /* package */ CommonDragAssistantDescriptor(IConfigurationElement aConfigElement) { @@ -53,8 +53,9 @@ public void run() throws Exception { da[0] = (CommonDragAdapterAssistant) element.createExecutableExtension(ATT_CLASS); } }); - if (da[0] != null) + if (da[0] != null) { return da[0]; + } return SkeletonCommonDragAssistant.INSTANCE; } diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/EvaluationCache.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/EvaluationCache.java index fed7ee207b4..60363114fb5 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/EvaluationCache.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/EvaluationCache.java @@ -120,8 +120,9 @@ private static NavigatorContentDescriptor[] getDescriptorsFromMap(Object anEleme */ public final NavigatorContentDescriptor[] getDescriptors(Object anElement, boolean toComputeOverrides) { cleanUpStaleEntries(); - if (anElement == null) + if (anElement == null) { return null; + } if (toComputeOverrides) { return getDescriptorsFromMap(anElement, evaluations); diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/EvaluationReference.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/EvaluationReference.java index 4dab99ecc6c..e3f6f593830 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/EvaluationReference.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/EvaluationReference.java @@ -73,13 +73,19 @@ public boolean equals(Object obj) { Object myObj = get(); // If the inner object is null, then the only EvaluationReference // that is equal is itself (checked above). - if (myObj == null) return false; + if (myObj == null) { + return false; + } EvaluationReference otherRef = (EvaluationReference) obj; - if (hashCode != otherRef.hashCode) return false; + if (hashCode != otherRef.hashCode) { + return false; + } // Not comparing type; it is valid for two objects of different // types to be equal. Object otherObj = otherRef.get(); - if (otherObj == null) return false; + if (otherObj == null) { + return false; + } return myObj == otherObj || myObj.equals(otherObj); } return false; diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/LinkHelperDescriptor.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/LinkHelperDescriptor.java index 91efcd13eb8..6634e092ab7 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/LinkHelperDescriptor.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/LinkHelperDescriptor.java @@ -94,8 +94,9 @@ public String getId() { * Skeleton Link Helper. */ public ILinkHelper createLinkHelper() { - if (hasLinkHelperFailedCreation) + if (hasLinkHelperFailedCreation) { return SkeletonLinkHelper.INSTANCE; + } final ILinkHelper[] helper = new ILinkHelper[1]; SafeRunner.run(new NavigatorSafeRunnable(configElement) { @Override @@ -103,8 +104,9 @@ public void run() throws Exception { helper[0] = (ILinkHelper) configElement.createExecutableExtension(ATT_CLASS); } }); - if (helper[0] != null) + if (helper[0] != null) { return helper[0]; + } hasLinkHelperFailedCreation = true; return SkeletonLinkHelper.INSTANCE; } diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorContentDescriptor.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorContentDescriptor.java index f5c4ffcf9c9..e1998f3a37f 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorContentDescriptor.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorContentDescriptor.java @@ -58,7 +58,7 @@ public final class NavigatorContentDescriptor implements private String name; - private IConfigurationElement configElement; + private final IConfigurationElement configElement; private int priority = Priority.NORMAL_PRIORITY_VALUE; @@ -208,11 +208,8 @@ private void init() throws WorkbenchException { if (id == null) { throw new WorkbenchException(NLS.bind( CommonNavigatorMessages.Attribute_Missing_Warning, - new Object[] { - ATT_ID, - id, - configElement.getDeclaringExtension() - .getContributor().getName() })); + ATT_ID, id, configElement.getDeclaringExtension() + .getContributor().getName())); } contribution = new IPluginContribution() { @@ -237,14 +234,13 @@ public String getPluginId() { initialActivation = new CustomAndExpression(children[0]); } else { throw new WorkbenchException(NLS.bind( - CommonNavigatorMessages.Attribute_Missing_Warning, new Object[] { - TAG_INITIAL_ACTIVATION, id, - configElement.getDeclaringExtension().getContributor().getName() })); + CommonNavigatorMessages.Attribute_Missing_Warning, TAG_INITIAL_ACTIVATION, id, configElement.getDeclaringExtension().getContributor().getName())); } } - if (sortOnly) + if (sortOnly) { return; + } children = configElement.getChildren(TAG_ENABLEMENT); if (children.length == 0) { @@ -255,11 +251,8 @@ public String getPluginId() { } else { throw new WorkbenchException(NLS.bind( CommonNavigatorMessages.Attribute_Missing_Warning, - new Object[] { - TAG_TRIGGER_POINTS, - id, - configElement.getDeclaringExtension() - .getContributor().getName() })); + TAG_TRIGGER_POINTS, id, configElement.getDeclaringExtension() + .getContributor().getName())); } children = configElement.getChildren(TAG_POSSIBLE_CHILDREN); @@ -268,11 +261,8 @@ public String getPluginId() { } else if(children.length > 1){ throw new WorkbenchException(NLS.bind( CommonNavigatorMessages.Attribute_Missing_Warning, - new Object[] { - TAG_POSSIBLE_CHILDREN, - id, - configElement.getDeclaringExtension() - .getContributor().getName() })); + TAG_POSSIBLE_CHILDREN, id, configElement.getDeclaringExtension() + .getContributor().getName())); } } else if (children.length == 1) { try { @@ -284,11 +274,8 @@ public String getPluginId() { } else if (children.length > 1) { throw new WorkbenchException(NLS.bind( CommonNavigatorMessages.Attribute_Missing_Warning, - new Object[] { - TAG_ENABLEMENT, - id, - configElement.getDeclaringExtension() - .getContributor().getName() })); + TAG_ENABLEMENT, id, configElement.getDeclaringExtension() + .getContributor().getName())); } children = configElement.getChildren(TAG_OVERRIDE); @@ -302,10 +289,8 @@ public String getPluginId() { } else if (children.length > 1) { throw new WorkbenchException(NLS.bind( CommonNavigatorMessages.Too_many_elements_Warning, - new Object[] { - TAG_OVERRIDE, - id,configElement.getDeclaringExtension() - .getContributor().getName() })); + TAG_OVERRIDE, id, configElement.getDeclaringExtension() + .getContributor().getName())); } } @@ -360,8 +345,9 @@ public IConfigurationElement getConfigElement() { * created for any reason */ public ITreeContentProvider createContentProvider() throws CoreException { - if (Policy.DEBUG_EXTENSION_SETUP) + if (Policy.DEBUG_EXTENSION_SETUP) { System.out.println("createContentProvider: " + this); //$NON-NLS-1$ + } return (ITreeContentProvider) configElement .createExecutableExtension(ATT_CONTENT_PROVIDER); } @@ -377,18 +363,21 @@ public ITreeContentProvider createContentProvider() throws CoreException { * created for any reason */ public ILabelProvider createLabelProvider() throws CoreException { - if (Policy.DEBUG_EXTENSION_SETUP) + if (Policy.DEBUG_EXTENSION_SETUP) { System.out.println("createLabelProvider: " + this); //$NON-NLS-1$ + } return (ILabelProvider) configElement .createExecutableExtension(ATT_LABEL_PROVIDER); } @Override public boolean isActiveByDefault() { - if (activeByDefault) + if (activeByDefault) { return true; - if (initialActivation == null) + } + if (initialActivation == null) { return false; + } IEvaluationContext context = NavigatorPlugin.getEvalContext(new Object()); return NavigatorPlugin.safeEvaluate(initialActivation, context) == EvaluationResult.TRUE; } @@ -497,11 +486,13 @@ public Set getOverriddingExtensions() { * by ExtensionPriorityComparator.DESCENDING */ public ListIterator getOverridingExtensionsListIterator(boolean fromStart) { - if (overridingExtensions == null) + if (overridingExtensions == null) { return Collections.EMPTY_LIST.listIterator(); + } - if (overridingExtensionsList == null) + if (overridingExtensionsList == null) { overridingExtensionsList = new ArrayList(overridingExtensions); + } return overridingExtensionsList.listIterator(fromStart ? 0 : overridingExtensionsList.size()); } @@ -516,8 +507,9 @@ public int hashCode() { if (hashCode == HASH_CODE_NOT_COMPUTED) { String hashCodeString = configElement.getNamespaceIdentifier() + getId(); hashCode = hashCodeString.hashCode(); - if (hashCode == HASH_CODE_NOT_COMPUTED) + if (hashCode == HASH_CODE_NOT_COMPUTED) { hashCode++; + } } return hashCode; } diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorContentDescriptorManager.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorContentDescriptorManager.java index 27f9875db9e..02313d53eb3 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorContentDescriptorManager.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorContentDescriptorManager.java @@ -403,8 +403,9 @@ private void computeOverrides() { private int findId(List list, String id) { for (int i = 0, len = list.size(); i < len; i++) { NavigatorContentDescriptor desc = list.get(i); - if (desc.getId().equals(id)) + if (desc.getId().equals(id)) { return i; + } } // Do not require content descriptor to exist in workspace NavigatorPlugin.log(IStatus.WARNING, 0, diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorContentExtension.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorContentExtension.java index ff3361a9c94..dfbb27af1ba 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorContentExtension.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorContentExtension.java @@ -41,9 +41,9 @@ public class NavigatorContentExtension implements IMementoAware, private static final NavigatorContentExtension[] NO_EXTENSIONS = new NavigatorContentExtension[0]; - private NavigatorContentService contentService; + private final NavigatorContentService contentService; - private NavigatorContentDescriptor descriptor; + private final NavigatorContentDescriptor descriptor; private SafeDelegateTreeContentProvider contentProvider; @@ -57,7 +57,7 @@ public class NavigatorContentExtension implements IMementoAware, private IMemento appliedMemento; - private StructuredViewerManager viewerManager; + private final StructuredViewerManager viewerManager; /** * Create an object to manage the instantiated elements from the extension. diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorViewerDescriptor.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorViewerDescriptor.java index e38eab476be..479c9ac3750 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorViewerDescriptor.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorViewerDescriptor.java @@ -276,9 +276,7 @@ public String toString() { NLS .bind( CommonNavigatorMessages.NavigatorViewerDescriptor_Popup_Menu_Overridden, - new Object[] { getViewerId(), - popupMenuId, - newPopupMenuId }), null); + getViewerId(), popupMenuId, newPopupMenuId), null); } popupMenuId = newPopupMenuId; } @@ -318,11 +316,8 @@ private void consumeBinding(IConfigurationElement element, boolean isContent) { } else if (includesElement.length >= 1) { NavigatorPlugin.logError(0, NLS.bind( CommonNavigatorMessages.Too_many_elements_Warning, - new Object[] { - TAG_INCLUDES, - element.getDeclaringExtension() - .getUniqueIdentifier(), - element.getDeclaringExtension().getContributor().getName() }), + TAG_INCLUDES, element.getDeclaringExtension() + .getUniqueIdentifier(), element.getDeclaringExtension().getContributor().getName()), null); } @@ -339,11 +334,8 @@ private void consumeBinding(IConfigurationElement element, boolean isContent) { } else if (excludesElement.length >= 1) { NavigatorPlugin.logError(0, NLS.bind( CommonNavigatorMessages.Too_many_elements_Warning, - new Object[] { - TAG_EXCLUDES, - element.getDeclaringExtension() - .getUniqueIdentifier(), - element.getDeclaringExtension().getContributor().getName() }), + TAG_EXCLUDES, element.getDeclaringExtension() + .getUniqueIdentifier(), element.getDeclaringExtension().getContributor().getName()), null); } } diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorViewerDescriptorManager.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorViewerDescriptorManager.java index 1556a1d0e90..44e28f572db 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorViewerDescriptorManager.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorViewerDescriptorManager.java @@ -96,12 +96,14 @@ protected boolean readElement(IConfigurationElement element) { NavigatorViewerDescriptor descriptor = getNavigatorViewerDescriptor(viewerId); String inherit = element.getAttribute(ATT_INHERIT_BINDINGS_FROM_VIEWER); - if (inherit != null) + if (inherit != null) { descriptor.setInheritBindingsFromViewer(inherit); + } String helpContext = element.getAttribute(ATT_HELP_CONTEXT); - if (helpContext != null) + if (helpContext != null) { descriptor.setHelpContext(helpContext); + } String attPopupMenuId = element.getAttribute(ATT_POPUP_MENU_ID); IConfigurationElement[] tagPopupMenu = element diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/SafeDelegateCommonLabelProvider.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/SafeDelegateCommonLabelProvider.java index 96bac640b04..c68bb1fe334 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/SafeDelegateCommonLabelProvider.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/SafeDelegateCommonLabelProvider.java @@ -78,8 +78,7 @@ public void init(ICommonContentExtensionSite aConfig) { @Override public String getDescription(Object element) { /* The following few lines were contributed as part of a patch. */ - if (delegateLabelProvider instanceof IDescriptionProvider) { - IDescriptionProvider provider = (IDescriptionProvider) delegateLabelProvider; + if (delegateLabelProvider instanceof IDescriptionProvider provider) { return provider.getDescription(element); } return null; @@ -116,8 +115,9 @@ public StyledString getStyledText(Object element) { return ((IStyledLabelProvider)delegateLabelProvider).getStyledText(element); } String text= getText(element); - if (text == null) + if (text == null) { text= ""; //$NON-NLS-1$ + } return new StyledString(text); } @@ -169,22 +169,25 @@ public void saveState(IMemento aMemento) { @Override public void updateLabel(ViewerLabel label, TreePath elementPath) { - if (delegateLabelProvider instanceof ITreePathLabelProvider) { - ITreePathLabelProvider tplp = (ITreePathLabelProvider) delegateLabelProvider; + if (delegateLabelProvider instanceof ITreePathLabelProvider tplp) { String text = label.getText() != null ? label.getText() : ""; //$NON-NLS-1$ Image image = label.getImage(); tplp.updateLabel(label, elementPath); - if(label.getText() == null) + if(label.getText() == null) { label.setText(text); - if(label.getImage() == null && image != null) + } + if(label.getImage() == null && image != null) { label.setImage(image); + } } else { Image image = getImage(elementPath.getLastSegment()); - if(image != null) + if(image != null) { label.setImage(image); + } String text = getText(elementPath.getLastSegment()); - if(text != null) + if(text != null) { label.setText(text); + } } } diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/SafeDelegateTreeContentProvider.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/SafeDelegateTreeContentProvider.java index 224837f8e85..21ca9aff8a8 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/SafeDelegateTreeContentProvider.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/SafeDelegateTreeContentProvider.java @@ -88,8 +88,7 @@ public boolean equals(Object anObject) { @Override public Object[] getChildren(Object aParentElement) { - if (aParentElement instanceof TreePath) { - TreePath tp = (TreePath) aParentElement; + if (aParentElement instanceof TreePath tp) { return getChildren(tp); } return contentProvider.getChildren(aParentElement); @@ -231,8 +230,7 @@ public boolean interceptUpdate( @Override public Object[] getChildren(TreePath parentPath) { - if (contentProvider instanceof ITreePathContentProvider) { - ITreePathContentProvider tpcp = (ITreePathContentProvider) contentProvider; + if (contentProvider instanceof ITreePathContentProvider tpcp) { return tpcp.getChildren(parentPath); } return getChildren(parentPath.getLastSegment()); @@ -240,8 +238,7 @@ public Object[] getChildren(TreePath parentPath) { @Override public boolean hasChildren(TreePath path) { - if (contentProvider instanceof ITreePathContentProvider) { - ITreePathContentProvider tpcp = (ITreePathContentProvider) contentProvider; + if (contentProvider instanceof ITreePathContentProvider tpcp) { return tpcp.hasChildren(path); } return hasChildren(path.getLastSegment()); @@ -249,16 +246,16 @@ public boolean hasChildren(TreePath path) { @Override public TreePath[] getParents(Object element) { - if (contentProvider instanceof ITreePathContentProvider) { - ITreePathContentProvider tpcp = (ITreePathContentProvider) contentProvider; + if (contentProvider instanceof ITreePathContentProvider tpcp) { return tpcp.getParents(element); } ArrayList segments = new ArrayList(); Object parent = element; do { parent = contentProvider.getParent(parent); - if (parent != null && parent != viewer.getInput()) + if (parent != null && parent != viewer.getInput()) { segments.add(0, parent); + } } while (parent != null && parent != viewer.getInput()); if (!segments.isEmpty()) { // Loop backwards over the array to create the path. diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/StructuredViewerManager.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/StructuredViewerManager.java index 2b685d1bb4d..610fb222bbf 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/StructuredViewerManager.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/StructuredViewerManager.java @@ -67,7 +67,7 @@ public class StructuredViewerManager { * provided the element. */ // Map - private Map viewerDataMap; + private final Map viewerDataMap; static class StructuredViewerAccess extends StructuredViewerInternals { static class Listener implements StructuredViewerInternals.AssociateListener { @@ -83,20 +83,23 @@ public void associate(Object element, Item item) { contentService.forgetContribution(element); synchronized (viewerDataMap) { if (viewerDataMap.containsKey(element)) { - if (Policy.DEBUG_VIEWER_MAP) + if (Policy.DEBUG_VIEWER_MAP) { System.out.println("associate: SKIPPED " + element + " item: " + item + " desc: " + desc + " FOUND"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + } return; } viewerDataMap.put(element, desc); - if (Policy.DEBUG_VIEWER_MAP) + if (Policy.DEBUG_VIEWER_MAP) { System.out.println("associate: " + element + " item: " + item + " desc: " + desc); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } } } @Override public void disassociate(Item item) { synchronized (viewerDataMap) { - if (Policy.DEBUG_VIEWER_MAP) + if (Policy.DEBUG_VIEWER_MAP) { System.out.println("disassociate: item: " + item + " object: " + item.getData()); //$NON-NLS-1$ //$NON-NLS-2$ + } viewerDataMap.remove(item.getData()); } } @@ -105,8 +108,9 @@ public void disassociate(Item item) { public void filteredOut(Object element) { contentService.forgetContribution(element); synchronized (viewerDataMap) { - if (Policy.DEBUG_VIEWER_MAP) + if (Policy.DEBUG_VIEWER_MAP) { System.out.println("filteredOut: object: " + element); //$NON-NLS-1$ + } viewerDataMap.remove(element); } } @@ -130,8 +134,9 @@ public Object getData(Object element) { */ public void resetViewerData() { synchronized (viewerDataMap) { - if (Policy.DEBUG_VIEWER_MAP) + if (Policy.DEBUG_VIEWER_MAP) { System.out.println("viewer map RESET"); //$NON-NLS-1$ + } viewerDataMap.clear(); } } @@ -184,14 +189,17 @@ public void safeRefresh() { final Viewer localViewer = viewer; - if (localViewer == null || localViewer.getControl().isDisposed()) + if (localViewer == null || localViewer.getControl().isDisposed()) { return; + } Display display = localViewer.getControl().getDisplay(); - if (display.isDisposed()) + if (display.isDisposed()) { return; + } display.syncExec(() -> { - if (localViewer.getControl().isDisposed()) + if (localViewer.getControl().isDisposed()) { return; + } SafeRunner.run(new NavigatorSafeRunnable() { @Override public void run() throws Exception { diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFilterContentProvider.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFilterContentProvider.java index 3831a393509..1efaf5ca48e 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFilterContentProvider.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFilterContentProvider.java @@ -32,7 +32,7 @@ public class CommonFilterContentProvider implements IStructuredContentProvider { private INavigatorContentService contentService; - private Object[] NO_ELEMENTS = new Object[0]; + private final Object[] NO_ELEMENTS = new Object[0]; @Override diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFilterDescriptor.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFilterDescriptor.java index 2ff7fd9fcbe..a85ea599176 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFilterDescriptor.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFilterDescriptor.java @@ -35,7 +35,7 @@ public class CommonFilterDescriptor implements ICommonFilterDescriptor, INavigatorContentExtPtConstants { - private IConfigurationElement element; + private final IConfigurationElement element; private Expression filterExpression; @@ -103,8 +103,9 @@ public boolean isActiveByDefault() { */ public boolean isVisibleInUi() { String attr = element.getAttribute(ATT_VISIBLE_IN_UI); - if (attr == null) + if (attr == null) { return true; + } return Boolean.parseBoolean(attr); } @@ -141,8 +142,9 @@ public void run() throws Exception { } }); - if (filter[0] != null) + if (filter[0] != null) { return filter[0]; + } return SkeletonViewerFilter.INSTANCE; } diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFilterDescriptorManager.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFilterDescriptorManager.java index d30d3420927..c52eb2643b0 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFilterDescriptorManager.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFilterDescriptorManager.java @@ -73,8 +73,9 @@ public CommonFilterDescriptor[] findVisibleFilters(INavigatorContentService cont List visibleFilters = new ArrayList<>(); for (CommonFilterDescriptor descriptor : filters.values()) { - if (forUI && !descriptor.isVisibleInUi()) + if (forUI && !descriptor.isVisibleInUi()) { continue; + } if (contentService.isVisible(descriptor.getId())) { visibleFilters.add(descriptor); } diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFilterSelectionDialog.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFilterSelectionDialog.java index 75029c0e821..64b9f12368c 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFilterSelectionDialog.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFilterSelectionDialog.java @@ -69,7 +69,7 @@ public class CommonFilterSelectionDialog extends TrayDialog { private ISelectionChangedListener updateDescriptionSelectionListener; - private String helpContext; + private final String helpContext; private UserFiltersTab userFiltersTab; diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFiltersTab.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFiltersTab.java index 413f9bcc40a..87055406c07 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFiltersTab.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFiltersTab.java @@ -49,13 +49,13 @@ public class CommonFiltersTab extends CustomizationTab { private Text filterText; - private ILabelProvider filterLabelProvider = new CommonFilterLabelProvider(); + private final ILabelProvider filterLabelProvider = new CommonFilterLabelProvider(); - private CommonFilterContentProvider filterContentProvider = new CommonFilterContentProvider(); + private final CommonFilterContentProvider filterContentProvider = new CommonFilterContentProvider(); - private TablePatternFilter patternFilter = new TablePatternFilter(); + private final TablePatternFilter patternFilter = new TablePatternFilter(); - private Deque filterDescriptorChangeHistory = new ArrayDeque<>(); + private final Deque filterDescriptorChangeHistory = new ArrayDeque<>(); protected CommonFiltersTab(Composite parent, INavigatorContentService aContentService) { diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CoreExpressionFilter.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CoreExpressionFilter.java index 8587d865c02..c8dc75db48b 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CoreExpressionFilter.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CoreExpressionFilter.java @@ -26,7 +26,7 @@ */ public class CoreExpressionFilter extends ViewerFilter { - private Expression filterExpression; + private final Expression filterExpression; /** * Creates a filter which hides all elements that match the given diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CustomizationTab.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CustomizationTab.java index 221f791c74c..cfa9b0b2533 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CustomizationTab.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CustomizationTab.java @@ -40,7 +40,7 @@ public class CustomizationTab extends Composite { private CheckboxTableViewer tableViewer; private final Set checkedItems = new HashSet(); - private ICheckStateListener checkListener = CustomizationTab.this::checkStateChanged; + private final ICheckStateListener checkListener = CustomizationTab.this::checkStateChanged; protected CustomizationTab(Composite parent, INavigatorContentService aContentService) { @@ -110,9 +110,10 @@ protected Set getCheckedItems() { } protected void checkStateChanged(CheckStateChangedEvent event) { - if (event.getChecked()) + if (event.getChecked()) { checkedItems.add(event.getElement()); - else + } else { checkedItems.remove(event.getElement()); + } } } diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/FilterActionGroup.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/FilterActionGroup.java index 5ea1975fa91..849515c3ae9 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/FilterActionGroup.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/FilterActionGroup.java @@ -57,8 +57,8 @@ public class FilterActionGroup extends ActionGroup implements IMementoAware { private IMenuManager menuManager; private IMenuListener menuListener; private IMenuManager filtersMenu; - private CommonViewer commonViewer; - private INavigatorViewerDescriptor viewerDescriptor; + private final CommonViewer commonViewer; + private final INavigatorViewerDescriptor viewerDescriptor; private Deque lruFilterDescriptorStack = new ArrayDeque<>(); @@ -179,8 +179,9 @@ protected void updateFilterShortcuts(ICommonFilterDescriptor[] filterDescriptorC length = Math.min(lruFilterDescriptorStack.size(), MAX_FILTER_MENU_ENTRIES - oldestFirstStack.size()); for (int i = 0; i < length; i++) { ICommonFilterDescriptor filter = lruFilterDescriptorStack.pollFirst(); - if (!oldestFirstStack.contains(filter)) + if (!oldestFirstStack.contains(filter)) { oldestFirstStack.push(filter); + } } lruFilterDescriptorStack = oldestFirstStack; } diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/FilterDialogSelectionListener.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/FilterDialogSelectionListener.java index 24040960061..81f454bc584 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/FilterDialogSelectionListener.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/FilterDialogSelectionListener.java @@ -29,7 +29,7 @@ public class FilterDialogSelectionListener implements ISelectionChangedListener { - private Label descriptionText; + private final Label descriptionText; protected FilterDialogSelectionListener(Label aDescriptionText) { descriptionText = aDescriptionText; @@ -40,20 +40,19 @@ protected FilterDialogSelectionListener(Label aDescriptionText) { public void selectionChanged(SelectionChangedEvent event) { IStructuredSelection structuredSelection = event.getStructuredSelection(); Object element = structuredSelection.getFirstElement(); - if (element instanceof INavigatorContentDescriptor) { - INavigatorContentDescriptor ncd = (INavigatorContentDescriptor) element; + if (element instanceof INavigatorContentDescriptor ncd) { String desc = NLS .bind( CommonNavigatorMessages.CommonFilterSelectionDialog_Hides_all_content_associated, new Object[] { ncd.getName() }); descriptionText.setText(desc); - } else if (element instanceof ICommonFilterDescriptor) { - ICommonFilterDescriptor cfd = (ICommonFilterDescriptor) element; + } else if (element instanceof ICommonFilterDescriptor cfd) { String description = cfd.getDescription(); - if(description != null) + if(description != null) { descriptionText.setText(description); - else + } else { descriptionText.setText(NLS.bind(CommonNavigatorMessages.FilterDialogSelectionListener_Enable_the_0_filter_, cfd.getName())); + } } } diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/SelectFiltersAction.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/SelectFiltersAction.java index f7f6cb5a30a..06bfef73e9e 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/SelectFiltersAction.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/SelectFiltersAction.java @@ -34,7 +34,7 @@ public class SelectFiltersAction extends Action { private final CommonViewer commonViewer; - private FilterActionGroup filterGroup; + private final FilterActionGroup filterGroup; /** * Create an action to drive the Filter selection dialog diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/ToggleFilterAction.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/ToggleFilterAction.java index 0e4bae170d1..923abe0f836 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/ToggleFilterAction.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/ToggleFilterAction.java @@ -27,11 +27,11 @@ */ public class ToggleFilterAction extends Action { - private ICommonFilterDescriptor descriptor; + private final ICommonFilterDescriptor descriptor; - private NavigatorFilterService filterService; + private final NavigatorFilterService filterService; - private CommonViewer commonViewer; + private final CommonViewer commonViewer; protected ToggleFilterAction(CommonViewer aCommonViewer, NavigatorFilterService aFilterService, diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/UpdateActiveExtensionsOperation.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/UpdateActiveExtensionsOperation.java index 2ac25b26d58..cfa487dcc11 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/UpdateActiveExtensionsOperation.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/UpdateActiveExtensionsOperation.java @@ -41,7 +41,7 @@ */ public class UpdateActiveExtensionsOperation extends AbstractOperation { - private String[] contentExtensionsToActivate; + private final String[] contentExtensionsToActivate; private final CommonViewer commonViewer; diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/UpdateActiveFiltersOperation.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/UpdateActiveFiltersOperation.java index cbd5acd547e..72278b0a9a7 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/UpdateActiveFiltersOperation.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/UpdateActiveFiltersOperation.java @@ -37,7 +37,7 @@ */ public class UpdateActiveFiltersOperation extends AbstractOperation { - private String[] filterIdsToActivate; + private final String[] filterIdsToActivate; private final CommonViewer commonViewer; diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/FrameAction.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/FrameAction.java index 0923a82fb30..754ceddb94d 100755 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/FrameAction.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/FrameAction.java @@ -24,9 +24,9 @@ * @since 3.4 */ public abstract class FrameAction extends Action { - private FrameList frameList; + private final FrameList frameList; - private IPropertyChangeListener propertyChangeListener = FrameAction.this::handlePropertyChange; + private final IPropertyChangeListener propertyChangeListener = FrameAction.this::handlePropertyChange; /** * Constructs a new action for the specified frame list. diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/FrameList.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/FrameList.java index d444d82d35a..b52633fc1b3 100755 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/FrameList.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/FrameList.java @@ -42,7 +42,7 @@ public class FrameList extends EventManager { /** Property name constant for the reset. */ public static final String P_RESET = "reset"; //$NON-NLS-1$ - private IFrameSource source; + private final IFrameSource source; private List frames; diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/TreeFrame.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/TreeFrame.java index b98e69927cf..dabaa0a0919 100755 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/TreeFrame.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/TreeFrame.java @@ -44,7 +44,7 @@ public class TreeFrame extends Frame { private static final String TAG_FACTORY_ID = "factoryID"; //$NON-NLS-1$ - private AbstractTreeViewer viewer; + private final AbstractTreeViewer viewer; private Object input; diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/TreeViewerFrameSource.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/TreeViewerFrameSource.java index fc3f2450168..e07e31f9f3e 100755 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/TreeViewerFrameSource.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/TreeViewerFrameSource.java @@ -27,7 +27,7 @@ */ public class TreeViewerFrameSource implements IFrameSource { - private AbstractTreeViewer viewer; + private final AbstractTreeViewer viewer; /** * Constructs a new tree viewer frame source for the specified tree viewer. @@ -64,8 +64,9 @@ protected TreeFrame createFrame(Object input) { protected void frameChanged(TreeFrame frame) { viewer.getControl().setRedraw(false); viewer.setInput(frame.getInput()); - if (frame.getExpandedElements() != null) + if (frame.getExpandedElements() != null) { viewer.setExpandedElements(frame.getExpandedElements()); + } viewer.setSelection(frame.getSelection(), true); viewer.getControl().setRedraw(true); } @@ -111,8 +112,9 @@ protected Frame getParentFrame(int flags) { ITreeContentProvider provider = (ITreeContentProvider) viewer .getContentProvider(); Object parent = provider.getParent(input); - if (parent == null) + if (parent == null) { return null; + } TreeFrame frame = createFrame(parent); if ((flags & IFrameSource.FULL_CONTEXT) != 0) { frame.setSelection(viewer.getSelection()); diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/sorters/CommonSorterDescriptor.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/sorters/CommonSorterDescriptor.java index 20f947c80d6..7aa14c2e73f 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/sorters/CommonSorterDescriptor.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/sorters/CommonSorterDescriptor.java @@ -37,7 +37,7 @@ */ public class CommonSorterDescriptor implements INavigatorContentExtPtConstants { - private IConfigurationElement element; + private final IConfigurationElement element; private Expression parentExpression; @@ -102,8 +102,9 @@ public void run() throws Exception { sorter[0] = createComparatorInstance(); } }); - if (sorter[0] != null) + if (sorter[0] != null) { return sorter[0]; + } return SkeletonViewerSorter.INSTANCE; } diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/sorters/NavigatorSorterService.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/sorters/NavigatorSorterService.java index 93c01e63e70..078cacd022b 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/sorters/NavigatorSorterService.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/sorters/NavigatorSorterService.java @@ -151,10 +151,11 @@ public Map findAvailableSorters(INavigatorContentDescr int count = 0; for (CommonSorterDescriptor descriptor : descriptors) { - if(descriptor.getId() != null && descriptor.getId().length() > 0) + if(descriptor.getId() != null && descriptor.getId().length() > 0) { sorters.put(descriptor.getId(), getComparator(descriptor)); - else + } else { sorters.put(theSource.getId() + ".sorter." + (++count), getComparator(descriptor)); //$NON-NLS-1$ + } } return sorters; } diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/wizards/CommonWizardDescriptor.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/wizards/CommonWizardDescriptor.java index 7b5250938a6..78c4df80a76 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/wizards/CommonWizardDescriptor.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/wizards/CommonWizardDescriptor.java @@ -54,7 +54,7 @@ public class CommonWizardDescriptor implements INavigatorContentExtPtConstants, private Expression enablement; - private IConfigurationElement configElement; + private final IConfigurationElement configElement; /** * @param aConfigElement The configuration element from the extension point. diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/wizards/CommonWizardDescriptorManager.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/wizards/CommonWizardDescriptorManager.java index bb382ad6fd3..70dd92a7c75 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/wizards/CommonWizardDescriptorManager.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/wizards/CommonWizardDescriptorManager.java @@ -47,7 +47,7 @@ public class CommonWizardDescriptorManager { */ public static final String WIZARD_TYPE_NEW = "new"; //$NON-NLS-1$ - private Map commonWizardDescriptors = new HashMap<>(); + private final Map commonWizardDescriptors = new HashMap<>(); /** * @return the singleton instance of the registry @@ -206,8 +206,9 @@ public void run() throws Exception { retValue[0] = true; } }); - if (!retValue[0]) + if (!retValue[0]) { break; + } } return retValue[0]; } diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/wizards/WizardShortcutAction.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/wizards/WizardShortcutAction.java index 5acf1da831a..a0932a48f7c 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/wizards/WizardShortcutAction.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/wizards/WizardShortcutAction.java @@ -40,9 +40,9 @@ * @since 3.2 */ public class WizardShortcutAction extends Action implements IPluginContribution { - private IWizardDescriptor descriptor; + private final IWizardDescriptor descriptor; - private IWorkbenchWindow window; + private final IWorkbenchWindow window; /** * diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonDragAdapter.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonDragAdapter.java index f7070752ad8..ef856f48fe3 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonDragAdapter.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonDragAdapter.java @@ -59,7 +59,7 @@ public final class CommonDragAdapter extends DragSourceAdapter { private CommonDragAdapterAssistant setDataAssistant; - private List assistantsToUse; + private final List assistantsToUse; /** * Create a DragAdapter that drives the configuration of the drag data. @@ -134,8 +134,9 @@ public void run() throws Exception { INavigatorDnDService dndService = contentService.getDnDService(); CommonDragAdapterAssistant[] assistants = dndService .getCommonDragAssistants(); - if (assistants.length == 0) + if (assistants.length == 0) { doIt = true; + } for (CommonDragAdapterAssistant assistant : assistants) { if (Policy.DEBUG_DND) { System.out @@ -228,8 +229,9 @@ public void run() throws Exception { } } }); - if (getOut[0]) + if (getOut[0]) { return; + } } } } @@ -258,8 +260,9 @@ public void dragFinished(DragSourceEvent event) { ISelection selection = LocalSelectionTransfer.getTransfer().getSelection(); - if (event.doit && selection instanceof IStructuredSelection && setDataAssistant != null) + if (event.doit && selection instanceof IStructuredSelection && setDataAssistant != null) { setDataAssistant.dragFinished(event, (IStructuredSelection) selection); + } setDataAssistant = null; diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonDropAdapter.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonDropAdapter.java index 5841fb393a5..3807a0df69b 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonDropAdapter.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonDropAdapter.java @@ -93,8 +93,9 @@ public Transfer[] getSupportedDropTransfers() { @Override public void dragEnter(DropTargetEvent event) { - if (event.detail == DND.DROP_NONE) + if (event.detail == DND.DROP_NONE) { return; + } if (Policy.DEBUG_DND) { System.out.println("CommonDropAdapter.dragEnter: " + event); //$NON-NLS-1$ @@ -190,8 +191,9 @@ public void run() throws Exception { } } }); - if (retValue[0]) + if (retValue[0]) { return true; + } } return false; diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonNavigator.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonNavigator.java index 7bc2f5ff294..1d72266a2b7 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonNavigator.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonNavigator.java @@ -156,7 +156,7 @@ public class CommonNavigator extends ViewPart implements ISetSelectionTarget, IS private boolean isLinkingEnabled; - private String LINKING_ENABLED = "CommonNavigator.LINKING_ENABLED"; //$NON-NLS-1$ + private final String LINKING_ENABLED = "CommonNavigator.LINKING_ENABLED"; //$NON-NLS-1$ private LinkHelperService linkService; @@ -244,8 +244,9 @@ public void handleLifecycleEvent(SaveablesLifecycleEvent event) { commonViewer.addSelectionChangedListener(event -> firePropertyChange(PROP_DIRTY)); String helpContext = commonViewer.getNavigatorContentService().getViewerDescriptor().getHelpContext(); - if (helpContext == null) + if (helpContext == null) { helpContext = HELP_CONTEXT; + } PlatformUI.getWorkbench().getHelpSystem().setHelp(commonViewer.getControl(), helpContext); boolean enableToolTipSupport = commonViewer.getNavigatorContentService().getViewerDescriptor() @@ -285,8 +286,9 @@ public void updateTitle() { * @since 3.4 */ public String getFrameToolTipText(Object anElement) { - if (commonViewer == null) + if (commonViewer == null) { return ""; //$NON-NLS-1$ + } return ((ILabelProvider) commonViewer.getLabelProvider()) .getText(anElement); } @@ -671,8 +673,9 @@ public boolean isSaveOnCloseNeeded() { @Override public boolean show(ShowInContext context) { - if (context == null) + if (context == null) { return false; + } ISelection selection = context.getSelection(); if (selection instanceof IStructuredSelection && !selection.isEmpty()) { selectReveal(selection); @@ -703,8 +706,9 @@ public boolean show(ShowInContext context) { * @since 3.4 */ protected synchronized LinkHelperService getLinkHelperService() { - if (linkService == null) + if (linkService == null) { linkService = new LinkHelperService((NavigatorContentService)getCommonViewer().getNavigatorContentService()); + } return linkService; } diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonNavigatorManager.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonNavigatorManager.java index 20fc9db1f73..8be71c484b1 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonNavigatorManager.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonNavigatorManager.java @@ -67,7 +67,7 @@ public final class CommonNavigatorManager implements ISelectionChangedListener { private UpdateActionBarsJob updateActionBars; - private ISelectionChangedListener statusBarListener = anEvent -> updateStatusBar(anEvent.getSelection()); + private final ISelectionChangedListener statusBarListener = anEvent -> updateStatusBar(anEvent.getSelection()); @@ -186,8 +186,9 @@ protected void open(ISelection selection, boolean activate) { }; - if(memento != null) + if(memento != null) { restoreState(memento); + } initContextMenu(); initViewMenu(); diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonViewer.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonViewer.java index 23d3ab2b900..74d85614710 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonViewer.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonViewer.java @@ -221,8 +221,9 @@ protected void handleLabelProviderChanged(LabelProviderChangedEvent event) { if (changed != null) { List others = new ArrayList<>(); for (Object changedElement : changed) { - if (changedElement == null) + if (changedElement == null) { continue; + } if (_mapper != null) { if (_mapper.handlesObject(changedElement)) { @@ -445,8 +446,9 @@ protected void unmapElement(Object element, Widget item) { */ @Override protected void unmapAllElements() { - if (_mapper != null) + if (_mapper != null) { _mapper.clearMap(); + } super.unmapAllElements(); } diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonViewerSorter.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonViewerSorter.java index 0e690ccf1f0..d8c5222c05e 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonViewerSorter.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonViewerSorter.java @@ -64,8 +64,9 @@ public void setContentService(INavigatorContentService aContentService) { @Override public int category(Object element) { - if (contentService == null) + if (contentService == null) { return 0; + } INavigatorContentDescriptor source = getSource(element); return source != null ? source.getSequenceNumber() : Priority.NORMAL_PRIORITY_VALUE; @@ -78,8 +79,9 @@ private void logMissingExtension(Object parent, Object object) { @Override public int compare(Viewer viewer, TreePath parentPath, Object e1, Object e2) { - if (contentService == null) + if (contentService == null) { return -1; + } INavigatorContentDescriptor sourceOfLvalue = getSource(e1); INavigatorContentDescriptor sourceOfRvalue = getSource(e2); @@ -144,8 +146,9 @@ public boolean isSorterProperty(Object element, String property) { NavigatorContentServiceContentProvider cp = (NavigatorContentServiceContentProvider) contentService.createCommonContentProvider(); TreePath[] parentPaths = cp.getParents(element); for (TreePath parentPath : parentPaths) { - if (isSorterProperty(parentPath, element, property)) + if (isSorterProperty(parentPath, element, property)) { return true; + } } return false; } @@ -153,11 +156,13 @@ public boolean isSorterProperty(Object element, String property) { @Override public boolean isSorterProperty(TreePath parentPath, Object element, String property) { INavigatorContentDescriptor contentDesc = getSource(element); - if (parentPath.getSegmentCount() == 0) + if (parentPath.getSegmentCount() == 0) { return false; + } ViewerComparator sorter = sorterService.findComparator(contentDesc, parentPath.getLastSegment(), element, null); - if (sorter != null) + if (sorter != null) { return sorter.isSorterProperty(element, property); + } return false; } @@ -166,20 +171,23 @@ private INavigatorContentDescriptor getSource(Object o) { // Fast path - just an optimization for the common case INavigatorContentDescriptor ncd = contentService.getSourceOfContribution(o); if (ncd != null) { - if (Policy.DEBUG_SORT) + if (Policy.DEBUG_SORT) { System.out.println("sort: " + ncd + " object: " + o); //$NON-NLS-1$//$NON-NLS-2$ + } return ncd; } Set descriptors = contentService.findDescriptorsByTriggerPoint(o, NavigatorContentService.CONSIDER_OVERRIDES); if (descriptors != null && descriptors.size() > 0) { ncd = (INavigatorContentDescriptor) descriptors.iterator().next(); - if (Policy.DEBUG_SORT) + if (Policy.DEBUG_SORT) { System.out.println("sort: " + ncd + " object: " + o); //$NON-NLS-1$//$NON-NLS-2$ + } return ncd; } - if (Policy.DEBUG_SORT) + if (Policy.DEBUG_SORT) { System.out.println("sort: NULL object: " + o); //$NON-NLS-1$ + } return null; } diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/LinkHelperService.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/LinkHelperService.java index a2930fc111b..e30923a4ed4 100755 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/LinkHelperService.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/LinkHelperService.java @@ -39,7 +39,7 @@ public class LinkHelperService { private static final ILinkHelper[] CANT_GET_NO_HELP = new ILinkHelper[0]; - private NavigatorContentService contentService; + private final NavigatorContentService contentService; private final Map linkHelpers = new HashMap(); @@ -70,8 +70,9 @@ public ILinkHelper[] getLinkHelpersFor(Object anObject) { for (LinkHelperDescriptor descriptor : descriptors) { helpers.add(getLinkHelper(descriptor)); } - if (helpers.isEmpty()) + if (helpers.isEmpty()) { return CANT_GET_NO_HELP; + } return (ILinkHelper[]) helpers.toArray(new ILinkHelper[helpers.size()]); } @@ -94,8 +95,9 @@ public ILinkHelper[] getLinkHelpersFor(IEditorInput input) { for (LinkHelperDescriptor descriptor : descriptors) { helpers.add(getLinkHelper(descriptor)); } - if (helpers.isEmpty()) + if (helpers.isEmpty()) { return CANT_GET_NO_HELP; + } return (ILinkHelper[]) helpers.toArray(new ILinkHelper[helpers.size()]); } diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/MenuInsertionPoint.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/MenuInsertionPoint.java index 8153a0b55d3..8b1583f0613 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/MenuInsertionPoint.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/MenuInsertionPoint.java @@ -22,9 +22,9 @@ * @since 3.2 */ public final class MenuInsertionPoint { - private String name; + private final String name; - private boolean isSeparator; + private final boolean isSeparator; private String toString; diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/NavigatorActionService.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/NavigatorActionService.java index caf099ac6fc..44176411018 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/NavigatorActionService.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/NavigatorActionService.java @@ -362,8 +362,9 @@ public void run() throws Exception { } }); // This could happen in the exception case - if (retProvider[0] == null) + if (retProvider[0] == null) { retProvider[0] = SkeletonActionProvider.INSTANCE; + } actionProviderInstances.put(aProviderDescriptor, retProvider[0]); provider = retProvider[0]; }