From 0f4ee61b1d04b4b53753a586c9537c352607c38d Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Sun, 20 Jan 2013 21:29:43 -0800 Subject: [PATCH] Cosmetics. --- .../ui/editor/AbstractCModelOutlinePage.java | 12 ++++---- .../ui/viewsupport/CUILabelProvider.java | 28 ------------------- 2 files changed, 6 insertions(+), 34 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java index 95cf35fb74f..e514bee2bb9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java @@ -207,7 +207,7 @@ public abstract class AbstractCModelOutlinePage extends Page PreferenceConstants.getPreferenceStore().setValue(PreferenceConstants.OUTLINE_GROUP_INCLUDES, isChecked()); } - public boolean isIncludesGroupingEnabled () { + public boolean isIncludesGroupingEnabled() { return PreferenceConstants.getPreferenceStore().getBoolean(PreferenceConstants.OUTLINE_GROUP_INCLUDES); } } @@ -240,7 +240,7 @@ public abstract class AbstractCModelOutlinePage extends Page PreferenceConstants.getPreferenceStore().setValue(PreferenceConstants.OUTLINE_GROUP_MACROS, isChecked()); } - public boolean isMacroGroupingEnabled () { + public boolean isMacroGroupingEnabled() { return PreferenceConstants.getPreferenceStore().getBoolean(PreferenceConstants.OUTLINE_GROUP_MACROS); } } @@ -374,8 +374,8 @@ public abstract class AbstractCModelOutlinePage extends Page } else if (fInput != null) { try { element= fInput.getElementAtOffset(offset); - } catch (CModelException exc) { - CUIPlugin.log(exc); + } catch (CModelException e) { + CUIPlugin.log(e); } } if (element != null) { @@ -526,7 +526,7 @@ public abstract class AbstractCModelOutlinePage extends Page fTreeViewer.setInput(fInput); PlatformUI.getWorkbench().getHelpSystem().setHelp(control, ICHelpContextIds.COUTLINE_VIEW); - IHandlerService handlerService= (IHandlerService)site.getService(IHandlerService.class); + IHandlerService handlerService= (IHandlerService) site.getService(IHandlerService.class); handlerService.activateHandler(CollapseAllHandler.COMMAND_ID, new ActionHandler(fCollapseAllAction)); } @@ -761,7 +761,7 @@ public abstract class AbstractCModelOutlinePage extends Page public void setInput(ITranslationUnit unit) { fInput = unit; if (fTreeViewer != null) { - fTreeViewer.setInput (fInput); + fTreeViewer.setInput(fInput); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CUILabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CUILabelProvider.java index 73ba44c79ae..432971e4673 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CUILabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CUILabelProvider.java @@ -32,7 +32,6 @@ import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels; import org.eclipse.cdt.ui.CUIPlugin; public class CUILabelProvider extends LabelProvider implements IColorProvider, IStyledLabelProvider { - protected CElementImageProvider fImageLabelProvider; protected StorageLabelProvider fStorageLabelProvider; @@ -136,9 +135,6 @@ public class CUILabelProvider extends LabelProvider implements IColorProvider, I return image; } - /* (non-Javadoc) - * @see ILabelProvider#getImage - */ @Override public Image getImage(Object element) { Image result= fImageLabelProvider.getImageLabel(element, evaluateImageFlags(element)); @@ -159,10 +155,6 @@ public class CUILabelProvider extends LabelProvider implements IColorProvider, I return text; } - - /* (non-Javadoc) - * @see ILabelProvider#getText - */ @Override public String getText(Object element) { String result= CElementLabels.getTextLabel(element, evaluateTextFlags(element)); @@ -186,10 +178,6 @@ public class CUILabelProvider extends LabelProvider implements IColorProvider, I return string; } - - /* (non-Javadoc) - * @see IBaseLabelProvider#dispose - */ @Override public void dispose() { if (fLabelDecorators != null) { @@ -203,9 +191,6 @@ public class CUILabelProvider extends LabelProvider implements IColorProvider, I fImageLabelProvider.dispose(); } - /* (non-Javadoc) - * @see IBaseLabelProvider#addListener(ILabelProviderListener) - */ @Override public void addListener(ILabelProviderListener listener) { if (fLabelDecorators != null) { @@ -217,17 +202,11 @@ public class CUILabelProvider extends LabelProvider implements IColorProvider, I super.addListener(listener); } - /* (non-Javadoc) - * @see IBaseLabelProvider#isLabelProperty(Object, String) - */ @Override public boolean isLabelProperty(Object element, String property) { return true; } - /* (non-Javadoc) - * @see IBaseLabelProvider#removeListener(ILabelProviderListener) - */ @Override public void removeListener(ILabelProviderListener listener) { if (fLabelDecorators != null) { @@ -252,9 +231,6 @@ public class CUILabelProvider extends LabelProvider implements IColorProvider, I return null; } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object) - */ @Override public Color getForeground(Object element) { if (element instanceof ISourceReference) { @@ -270,12 +246,8 @@ public class CUILabelProvider extends LabelProvider implements IColorProvider, I return fDefaultColor; } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object) - */ @Override public Color getBackground(Object element) { return null; } - }