From 33ebd6b7b96e1005b68bab9e49e00ae9fc67d746 Mon Sep 17 00:00:00 2001 From: Markus Schorn Date: Fri, 7 Jul 2006 13:59:59 +0000 Subject: [PATCH] Fixes warnings --- .../ui/buildconsole/BuildConsoleManager.java | 18 ++++++++++-------- .../ui/buildconsole/BuildConsolePage.java | 3 +-- .../codemanipulation/AddIncludesOperation.java | 2 -- .../ui/codemanipulation/StubUtility.java | 10 +++++----- .../eclipse/cdt/internal/ui/compare/CNode.java | 12 ------------ .../internal/ui/compare/CStructureCreator.java | 18 ------------------ .../eclipse/cdt/internal/ui/cview/CView.java | 2 +- .../internal/ui/cview/CViewActionGroup.java | 4 +++- .../ui/cview/CViewContentProvider.java | 3 --- .../internal/ui/cview/CViewLabelProvider.java | 4 ---- .../ui/cview/SelectionTransferDragAdapter.java | 1 - .../cdt/internal/ui/dialogs/StatusDialog.java | 16 +--------------- 12 files changed, 21 insertions(+), 72 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java index 4e712f7bc97..6b87136945e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java @@ -13,25 +13,19 @@ package org.eclipse.cdt.internal.ui.buildconsole; import java.util.HashMap; import java.util.Map; -import org.eclipse.cdt.core.resources.IConsole; -import org.eclipse.cdt.internal.ui.preferences.BuildConsolePreferencePage; -import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.IBuildConsoleEvent; -import org.eclipse.cdt.ui.IBuildConsoleListener; -import org.eclipse.cdt.ui.IBuildConsoleManager; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceChangeEvent; import org.eclipse.core.resources.IResourceChangeListener; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.ListenerList; import org.eclipse.core.runtime.Status; import org.eclipse.jface.preference.PreferenceConverter; import org.eclipse.jface.text.Assert; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IDocumentPartitioner; import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.ListenerList; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.RGB; @@ -45,9 +39,17 @@ import org.eclipse.ui.console.ConsolePlugin; import org.eclipse.ui.console.IConsoleConstants; import org.eclipse.ui.console.IConsoleView; +import org.eclipse.cdt.core.resources.IConsole; +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.IBuildConsoleEvent; +import org.eclipse.cdt.ui.IBuildConsoleListener; +import org.eclipse.cdt.ui.IBuildConsoleManager; + +import org.eclipse.cdt.internal.ui.preferences.BuildConsolePreferencePage; + public class BuildConsoleManager implements IBuildConsoleManager, IResourceChangeListener, IPropertyChangeListener { - ListenerList listeners = new ListenerList(1); + ListenerList listeners = new ListenerList(); BuildConsole fConsole; private Map fConsoleMap = new HashMap(); Color infoColor, outputColor, errorColor; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java index 7c1c6363fb2..b79a53dc8b9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java @@ -336,7 +336,6 @@ public class BuildConsolePage extends Page protected void setInitialSelection() { // Use the selection, if any - Object input; IWorkbenchPage page= getSite().getPage(); ISelection selection= null; if (page != null) @@ -446,7 +445,7 @@ public class BuildConsolePage extends Page /** * Sets the tab width for this page. * - * @param int + * @param tabs * tab width */ protected void setTabs(int tabs) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/codemanipulation/AddIncludesOperation.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/codemanipulation/AddIncludesOperation.java index 6e9f7415853..3673aed2856 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/codemanipulation/AddIncludesOperation.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/codemanipulation/AddIncludesOperation.java @@ -43,7 +43,6 @@ public class AddIncludesOperation implements IWorkspaceRunnable { private ITranslationUnit fTranslationUnit; private IRequiredInclude[] fIncludes; private String[] fUsings; - private boolean fDoSave; private String newLine = System.getProperty("line.separator", "\n"); //$NON-NLS-1$//$NON-NLS-2$ @@ -62,7 +61,6 @@ public class AddIncludesOperation implements IWorkspaceRunnable { fIncludes= includes; fUsings = using; fTranslationUnit = tu; - fDoSave= save; } public void executeInludes(IProgressMonitor monitor) throws CoreException { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/codemanipulation/StubUtility.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/codemanipulation/StubUtility.java index 34060187003..deaa56ad57d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/codemanipulation/StubUtility.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/codemanipulation/StubUtility.java @@ -20,20 +20,20 @@ import org.eclipse.swt.SWT; public class StubUtility { /** - * @see org.eclipse.jdt.ui.CodeGeneration#getTypeComment(ICompilationUnit, String, String) + * Not implemented, returns "". */ public static String getHeaderFileContent(ITranslationUnit cu, String typeComment, String typeContent, String lineDelimiter) throws CoreException { return ""; //$NON-NLS-1$ } /** - * @see org.eclipse.jdt.ui.CodeGeneration#getTypeComment(ICompilationUnit, String, String) + * Not implemented, returns "". */ public static String getBodyFileContent(ITranslationUnit cu, String typeComment, String typeContent, String lineDelimiter) throws CoreException { return ""; //$NON-NLS-1$ } - /* - * @see org.eclipse.jdt.ui.CodeGeneration#getTypeComment(ICompilationUnit, String, String) - */ + /** + * Not implemented, returns "". + */ public static String getClassComment(ITranslationUnit cu, String typeQualifiedName, String lineDelim) throws CoreException { return ""; //$NON-NLS-1$ } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CNode.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CNode.java index 2d4a3cee15d..ccc00de6fa9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CNode.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CNode.java @@ -24,11 +24,8 @@ import org.eclipse.swt.graphics.Image; class CNode extends DocumentRangeNode implements ITypedElement { - private CNode fParent; - public CNode(CNode parent, int type, String id, IDocument doc, int start, int length) { super(type, id, doc, start, length); - fParent= parent; if (parent != null) { parent.addChild(this); } @@ -38,23 +35,14 @@ class CNode extends DocumentRangeNode implements ITypedElement { this(parent, type, id, parent.getDocument(), start, length); } - /** - * @see ITypedInput#getName - */ public String getName() { return getId(); } - /** - * @see ITypedInput#getType - */ public String getType() { return "c2"; //$NON-NLS-1$ } - /** - * @see ITypedInput#getImage - */ public Image getImage() { ImageDescriptor descriptor = CElementImageProvider.getImageDescriptor(getTypeCode()); return CUIPlugin.getImageDescriptorRegistry().get(descriptor); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreator.java index 0995f1bf355..224532b1611 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreator.java @@ -47,16 +47,10 @@ public class CStructureCreator implements IStructureCreator { public CStructureCreator() { } - /** - * @see IStructureCreator#getTitle - */ public String getName() { return CUIPlugin.getResourceString(NAME); } - /** - * @see IStructureCreator#getStructure - */ public IStructureComparator getStructure(Object input) { String s = null; @@ -94,30 +88,18 @@ public class CStructureCreator implements IStructureCreator { return root; } - /** - * @see IStructureCreator#canSave - */ public boolean canSave() { return true; } - /** - * @see IStructureCreator#locate - */ public IStructureComparator locate(Object path, Object source) { return null; } - /** - * @see IStructureCreator#canRewriteTree - */ public boolean canRewriteTree() { return false; } - /** - * @see IStructureCreator#rewriteTree - */ public void rewriteTree(Differencer differencer, IDiffContainer root) { } 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 d2462320589..66d3df8d3d0 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 @@ -204,7 +204,7 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha * Reveal and select the passed element selection in self's visual * component * - * @see ISetSelectionTarget#selectReveal() + * @see ISetSelectionTarget#selectReveal(ISelection) */ public void selectReveal(ISelection selection) { IStructuredSelection ssel = SelectionConverter.convertSelectionToCElements(selection); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewActionGroup.java index c9808030843..27f056d6bac 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewActionGroup.java @@ -21,6 +21,8 @@ import org.eclipse.swt.events.KeyEvent; import org.eclipse.ui.IActionBars; import org.eclipse.ui.IMemento; import org.eclipse.ui.actions.ActionGroup; +import org.eclipse.ui.views.navigator.SortAndFilterActionGroup; +import org.eclipse.ui.views.navigator.WorkspaceActionGroup; /** * This is the action group for all the view actions. @@ -43,7 +45,7 @@ public abstract class CViewActionGroup extends ActionGroup { /** * Constructs a new navigator action group and creates its actions. * - * @param navigator the resource navigator + * @param cview the CView */ public CViewActionGroup(CView cview) { this.cview = cview; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewContentProvider.java index d31353ed471..3c78cf1732c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewContentProvider.java @@ -90,9 +90,6 @@ public class CViewContentProvider extends CElementContentProvider { return ref.getChildren(); } - /** - * @return - */ private Object[] getProjectChildren(ICProject cproject) throws CModelException { Object[] extras = null; IArchiveContainer archive = cproject.getArchiveContainer(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java index c170525aa27..906f121e590 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java @@ -27,10 +27,6 @@ import org.eclipse.swt.graphics.Image; */ public class CViewLabelProvider extends StandardCElementLabelProvider { - /** - * @param flags - * @param adormentProviders - */ public CViewLabelProvider(int textFlags, int imageFlags) { super(textFlags, imageFlags); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/SelectionTransferDragAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/SelectionTransferDragAdapter.java index 0d3d3834dac..e63d95bcae7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/SelectionTransferDragAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/SelectionTransferDragAdapter.java @@ -31,7 +31,6 @@ public class SelectionTransferDragAdapter extends BasicSelectionTransferDragAdap for (Iterator iter= ((IStructuredSelection)selection).iterator(); iter.hasNext();) { Object element= iter.next(); if (element instanceof ICElement) { - ICElement celement = (ICElement)element; if (!(element instanceof ISourceReference)) { return false; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusDialog.java index 8c99058eac7..4d56929f0bb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusDialog.java @@ -39,27 +39,13 @@ public abstract class StatusDialog extends Dialog { private String fTitle; private Image fImage; - private boolean fStatusLineAboveButtons; - /** * Creates an instane of a status dialog. */ public StatusDialog(Shell parent) { super(parent); - fStatusLineAboveButtons= false; } - - /** - * Specifies whether status line appears to the left of the buttons (default) - * or above them. - * - * @param aboveButtons if true status line is placed above buttons; if - * false to the right - */ - public void setStatusLineAboveButtons(boolean aboveButtons) { - fStatusLineAboveButtons= aboveButtons; - } - + /** * Update the dialog's status line to reflect the given status. * It is save to call this method before the dialog has been opened.