From e6ecdc51cd6a1bc96b4b3a3146bb01cb0aab1782 Mon Sep 17 00:00:00 2001 From: David Inglis Date: Mon, 21 Apr 2003 16:23:27 +0000 Subject: [PATCH] cleanup --- .../src/org/eclipse/cdt/internal/ui/cview/CView.java | 4 +--- .../cdt/internal/ui/editor/CDocumentProvider.java | 11 ----------- .../internal/ui/editor/CEditorActionContributor.java | 3 --- .../internal/ui/editor/SearchForReferencesAction.java | 4 ---- 4 files changed, 1 insertion(+), 21 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java index d07d9a9d30a..5c62d3fbd56 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java @@ -418,9 +418,7 @@ public class CView extends ViewPart implements IMenuListener, ISetSelectionTarge boolean showCUChildren= CPluginPreferencePage.showCompilationUnitChildren(); viewer.setUseHashlookup (true); viewer.setContentProvider(new CElementContentProvider (showCUChildren, true)); - viewer.setLabelProvider (new DecoratingLabelProvider( - new StandardCElementLabelProvider (), - PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator())); + setLabelDecorator(PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator()); CUIPlugin.getDefault().getProblemMarkerManager().addListener(viewer); CUIPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(this); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java index fbc691e6326..4c0b00da7e5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java @@ -31,8 +31,6 @@ import org.eclipse.jface.text.DefaultLineTracker; import org.eclipse.jface.text.Document; import org.eclipse.jface.text.GapTextStore; import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IDocumentExtension; -import org.eclipse.jface.text.IDocumentListener; import org.eclipse.jface.text.IDocumentPartitioner; import org.eclipse.jface.text.source.IAnnotationModel; import org.eclipse.ui.IEditorInput; @@ -44,15 +42,6 @@ import org.eclipse.ui.texteditor.AbstractMarkerAnnotationModel; public class CDocumentProvider extends FileDocumentProvider { - static private class RegisteredReplace { - IDocumentListener fOwner; - IDocumentExtension.IReplace fReplace; - - RegisteredReplace(IDocumentListener owner, IDocumentExtension.IReplace replace) { - fOwner= owner; - fReplace= replace; - } - }; /** * Bundle of all required informations to allow working copy management. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java index 09da8754962..c3b611aa599 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java @@ -23,8 +23,6 @@ import org.eclipse.ui.editors.text.TextEditorActionContributor; import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.ui.texteditor.RetargetTextEditorAction; import org.eclipse.ui.texteditor.TextEditorAction; -import org.eclipse.ui.texteditor.TextOperationAction; - public class CEditorActionContributor extends TextEditorActionContributor { @@ -85,7 +83,6 @@ public class CEditorActionContributor extends TextEditorActionContributor { protected RetargetTextEditorAction fOpenOnSelection; protected SelectionAction fShiftLeft; protected SelectionAction fShiftRight; - private TextOperationAction caAction; private TogglePresentationAction fTogglePresentation; //private ToggleTextHoverAction fToggleTextHover; private GotoErrorAction fPreviousError; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SearchForReferencesAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SearchForReferencesAction.java index 2acbcbbb624..16c5844a4d0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SearchForReferencesAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SearchForReferencesAction.java @@ -37,12 +37,8 @@ public class SearchForReferencesAction extends Action { private static final String PREFIX= "SearchForReferencesAction."; - private static final String DIALOG_TITLE= PREFIX + "dialog.title"; - private static final String DIALOG_MESSAGE= PREFIX + "dialog.message"; - private ISelectionProvider fSelectionProvider; - public SearchForReferencesAction(ISelectionProvider provider) { super(CUIPlugin.getResourceString(PREFIX + "label")); setDescription(CUIPlugin.getResourceString(PREFIX + "description"));