diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index 78a98fe9368..ff6e3cd14df 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,8 @@ +2004-12-22 Alain Magloire + + On going work to clean cdt.ui from misc. warnings + and removing the deprecated interfaces in Eclipse-3.1 + 2004-12-21 Alain Magloire We use TogglePresentation action definition ID rather the one define in the CDT, since now the platfrom defines one. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/Assert.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/Assert.java index fa66f67bd79..d9a6d508045 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/Assert.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/Assert.java @@ -42,6 +42,11 @@ public final class Assert { */ private static class AssertionFailedException extends RuntimeException { + /** + * Comment for serialVersionUID + */ + private static final long serialVersionUID = 1L; + /** * Constructs a new exception. */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/textmanipulation/GroupDescription.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/textmanipulation/GroupDescription.java index 141bf5b0fc4..482a4debccf 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/textmanipulation/GroupDescription.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/textmanipulation/GroupDescription.java @@ -64,9 +64,8 @@ public class GroupDescription { int size= fEdits.size(); if (size == 1) { return ((TextEdit)fEdits.get(0)).getRegion(); - } else { - return TextEdit.getCoverage((TextEdit[])fEdits.toArray(new TextEdit[fEdits.size()])); } + return TextEdit.getCoverage((TextEdit[])fEdits.toArray(new TextEdit[fEdits.size()])); } public String getName() { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/textmanipulation/TextBufferFactory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/textmanipulation/TextBufferFactory.java index 63a3a913871..bd144124c27 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/textmanipulation/TextBufferFactory.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/textmanipulation/TextBufferFactory.java @@ -122,9 +122,8 @@ import org.eclipse.ui.texteditor.IDocumentProvider; IDocument document= fDocumentProvider.getDocument(input); if (document != null) { return new TextBuffer(new Document(document.get())); - } else { - return createFromFile(file); } + return createFromFile(file); } private TextBuffer createFromFile(IFile file) throws CoreException { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/CodeFormatterUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/CodeFormatterUtil.java index 088636aebbe..ee9acd3a48c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/CodeFormatterUtil.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/CodeFormatterUtil.java @@ -23,10 +23,6 @@ import org.eclipse.jface.text.BadPositionCategoryException; import org.eclipse.jface.text.DefaultPositionUpdater; import org.eclipse.jface.text.Document; import org.eclipse.jface.text.Position; -import org.eclipse.text.edits.DeleteEdit; -import org.eclipse.text.edits.InsertEdit; -import org.eclipse.text.edits.MultiTextEdit; -import org.eclipse.text.edits.ReplaceEdit; import org.eclipse.text.edits.TextEdit; public class CodeFormatterUtil { @@ -82,31 +78,31 @@ public class CodeFormatterUtil { } - private static TextEdit shifEdit(TextEdit oldEdit, int diff) { - TextEdit newEdit; - if (oldEdit instanceof ReplaceEdit) { - ReplaceEdit edit= (ReplaceEdit) oldEdit; - newEdit= new ReplaceEdit(edit.getOffset() - diff, edit.getLength(), edit.getText()); - } else if (oldEdit instanceof InsertEdit) { - InsertEdit edit= (InsertEdit) oldEdit; - newEdit= new InsertEdit(edit.getOffset() - diff, edit.getText()); - } else if (oldEdit instanceof DeleteEdit) { - DeleteEdit edit= (DeleteEdit) oldEdit; - newEdit= new DeleteEdit(edit.getOffset() - diff, edit.getLength()); - } else if (oldEdit instanceof MultiTextEdit) { - newEdit= new MultiTextEdit(); - } else { - return null; // not supported - } - TextEdit[] children= oldEdit.getChildren(); - for (int i= 0; i < children.length; i++) { - TextEdit shifted= shifEdit(children[i], diff); - if (shifted != null) { - newEdit.addChild(shifted); - } - } - return newEdit; - } +// private static TextEdit shifEdit(TextEdit oldEdit, int diff) { +// TextEdit newEdit; +// if (oldEdit instanceof ReplaceEdit) { +// ReplaceEdit edit= (ReplaceEdit) oldEdit; +// newEdit= new ReplaceEdit(edit.getOffset() - diff, edit.getLength(), edit.getText()); +// } else if (oldEdit instanceof InsertEdit) { +// InsertEdit edit= (InsertEdit) oldEdit; +// newEdit= new InsertEdit(edit.getOffset() - diff, edit.getText()); +// } else if (oldEdit instanceof DeleteEdit) { +// DeleteEdit edit= (DeleteEdit) oldEdit; +// newEdit= new DeleteEdit(edit.getOffset() - diff, edit.getLength()); +// } else if (oldEdit instanceof MultiTextEdit) { +// newEdit= new MultiTextEdit(); +// } else { +// return null; // not supported +// } +// TextEdit[] children= oldEdit.getChildren(); +// for (int i= 0; i < children.length; i++) { +// TextEdit shifted= shifEdit(children[i], diff); +// if (shifted != null) { +// newEdit.addChild(shifted); +// } +// } +// return newEdit; +// } private static Document createDocument(String string, Position[] positions) throws IllegalArgumentException { Document doc= new Document(string); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BinaryPropertySource.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BinaryPropertySource.java index 6ed34792ef8..1e7d6497159 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BinaryPropertySource.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BinaryPropertySource.java @@ -127,9 +127,8 @@ public class BinaryPropertySource extends FilePropertySource implements IPropert } else if (name.equals(ICElementPropertyConstants.P_ELF_HAS_DEBUG)) { if (binary.hasDebug()) { return "true";//$NON-NLS-1$ - } else { - return "false";//$NON-NLS-1$ } + return "false";//$NON-NLS-1$ } else if (name.equals(ICElementPropertyConstants.P_ELF_NEEDED)) { String[] needed = binary.getNeededSharedLibs(); String need = ""; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementAdapterFactory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementAdapterFactory.java index d1be286e292..102fe7328f6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementAdapterFactory.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementAdapterFactory.java @@ -52,14 +52,13 @@ public class CElementAdapterFactory implements IAdapterFactory { if (IPropertySource.class.equals(key)) { if (celem instanceof IBinary) { return new BinaryPropertySource((IBinary)celem); - } else { - res = celem.getResource(); - if (res != null) { - if (res instanceof IFile) { - return new FilePropertySource((IFile)res); - } - return new ResourcePropertySource(res); + } + res = celem.getResource(); + if (res != null) { + if (res instanceof IFile) { + return new FilePropertySource((IFile)res); } + return new ResourcePropertySource(res); } return new CElementPropertySource(celem); } else if (IWorkspaceRoot.class.equals(key)) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CHelpProviderManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CHelpProviderManager.java index fd649d02be1..98502a9564f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CHelpProviderManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CHelpProviderManager.java @@ -14,8 +14,6 @@ package org.eclipse.cdt.internal.ui; import java.io.File; import java.io.FileWriter; import java.io.IOException; -import java.util.HashMap; -import java.util.Map; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -50,7 +48,7 @@ public class CHelpProviderManager { final private static String C_HELP_SETTINGS_FILE_NAME = "cHelpSettings.xml"; //$NON-NLS-1$ final private static String ELEMENT_ROOT = "cHelpSettings"; //$NON-NLS-1$ - private static Map fProjectHelpSettings = null; + //private static Map fProjectHelpSettings = null; private static CHelpSettings fDefaultHelpSettings = null; private static File fSettingsFile = null; @@ -69,11 +67,11 @@ public class CHelpProviderManager { return fSettingsFile; } - private static Map getSettingsMap(){ - if(fProjectHelpSettings == null) - fProjectHelpSettings = new HashMap(); - return fProjectHelpSettings; - } +// private static Map getSettingsMap(){ +// if(fProjectHelpSettings == null) +// fProjectHelpSettings = new HashMap(); +// return fProjectHelpSettings; +// } private static CHelpSettings getDefaultHelpSettings(){ if(fDefaultHelpSettings == null){ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPerspectiveFactory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPerspectiveFactory.java index cb10b216da8..5756772a221 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPerspectiveFactory.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPerspectiveFactory.java @@ -7,7 +7,7 @@ package org.eclipse.cdt.internal.ui; import org.eclipse.cdt.internal.ui.wizards.CWizardRegistry; import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.search.ui.SearchUI; +import org.eclipse.search.ui.NewSearchUI; import org.eclipse.ui.IFolderLayout; import org.eclipse.ui.IPageLayout; import org.eclipse.ui.IPerspectiveFactory; @@ -48,7 +48,7 @@ public class CPerspectiveFactory implements IPerspectiveFactory { layout.addShowViewShortcut(IConsoleConstants.ID_CONSOLE_VIEW); // views - searching - layout.addShowViewShortcut(SearchUI.SEARCH_RESULT_VIEW_ID); + layout.addShowViewShortcut(NewSearchUI.SEARCH_VIEW_ID); // views - standard workbench layout.addShowViewShortcut(IPageLayout.ID_OUTLINE); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIException.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIException.java index 0c2462b1a26..b3836676abd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIException.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIException.java @@ -16,6 +16,11 @@ import org.eclipse.core.runtime.IStatus; public class CUIException extends CoreException { + /** + * Comment for serialVersionUID + */ + private static final long serialVersionUID = 1L; + public CUIException(IStatus status) { super(status); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/DeferredCWorkbenchAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/DeferredCWorkbenchAdapter.java index 4d3eab57668..63dc5660a25 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/DeferredCWorkbenchAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/DeferredCWorkbenchAdapter.java @@ -78,9 +78,8 @@ public class DeferredCWorkbenchAdapter extends CWorkbenchAdapter if (fSerializeFetching) { // only one ICElement parent can fetch children at a time return mutexRule; - } else { - // allow several ICElement parents to fetch children concurrently - return null; - } + } + // allow several ICElement parents to fetch children concurrently + return null; } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectionConverter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectionConverter.java index 5638005305d..450d950c454 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectionConverter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectionConverter.java @@ -150,8 +150,7 @@ public class SelectionConverter { ICElement ref = tunit.getElementAtOffset(selection.getOffset()); if (ref == null) return input; - else - return ref; + return ref; } return null; } @@ -169,8 +168,7 @@ public class SelectionConverter { ICElement[] refs = tunit.getElementsAtOffset(selection.getOffset()); if (refs == null) return new ICElement[] { input }; - else - return refs; + return refs; } return null; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/WorkbenchRunnableAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/WorkbenchRunnableAdapter.java index 8345d6a4059..93e79a42c87 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/WorkbenchRunnableAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/WorkbenchRunnableAdapter.java @@ -80,9 +80,8 @@ public class WorkbenchRunnableAdapter implements IRunnableWithProgress { Throwable cause= e.getCause(); if (cause instanceof CoreException) { return ((CoreException) cause).getStatus(); - } else { - return CUIStatus.createError(IStatus.ERROR, cause); } + return CUIStatus.createError(IStatus.ERROR, cause); } catch (InterruptedException e) { return Status.CANCEL_STATUS; } finally { 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 18d9122658c..c494008cc77 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 @@ -14,6 +14,7 @@ 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; @@ -47,8 +48,8 @@ public class BuildConsoleManager implements IBuildConsoleManager, IResourceChang ListenerList listeners = new ListenerList(1); BuildConsole fConsole; private Map fConsoleMap = new HashMap(); - private Color infoColor, outputColor, errorColor; - private BuildConsoleStream infoStream, outputStream, errorStream; + Color infoColor, outputColor, errorColor; + BuildConsoleStream infoStream, outputStream, errorStream; static public final int BUILD_STREAM_TYPE_INFO = 0; static public final int BUILD_STREAM_TYPE_OUTPUT = 1; @@ -68,7 +69,7 @@ public class BuildConsoleManager implements IBuildConsoleManager, IResourceChang if (list.length > 0) { for (int i = 0; i < list.length; i++) { IBuildConsoleListener listener = (IBuildConsoleListener)list[i]; - ConsoleEvent event = new ConsoleEvent(BuildConsoleManager.this, project, ConsoleEvent.CONSOLE_START); + ConsoleEvent event = new ConsoleEvent(BuildConsoleManager.this, project, IBuildConsoleEvent.CONSOLE_START); listener.consoleChange(event); } } @@ -134,7 +135,7 @@ public class BuildConsoleManager implements IBuildConsoleManager, IResourceChang if (list.length > 0) { for (int i = 0; i < list.length; i++) { IBuildConsoleListener listener = (IBuildConsoleListener)list[i]; - ConsoleEvent consoleEvent = new ConsoleEvent(this, (IProject)resource, ConsoleEvent.CONSOLE_CLOSE); + ConsoleEvent consoleEvent = new ConsoleEvent(this, (IProject)resource, IBuildConsoleEvent.CONSOLE_CLOSE); listener.consoleChange(consoleEvent); } } @@ -237,7 +238,7 @@ public class BuildConsoleManager implements IBuildConsoleManager, IResourceChang /** * Returns a color instance based on data from a preference field. */ - private Color createColor(Display display, String preference) { + Color createColor(Display display, String preference) { RGB rgb = PreferenceConverter.getColor(CUIPlugin.getDefault().getPreferenceStore(), preference); return new Color(display, rgb); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePartitioner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePartitioner.java index b7570c6f5c2..20025acae97 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePartitioner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePartitioner.java @@ -62,9 +62,9 @@ public class BuildConsolePartitioner * Intentionally a vector to obtain synchronization as entries are added and * removed. */ - private Vector fQueue = new Vector(5); + Vector fQueue = new Vector(5); - private boolean fAppending; + //private boolean fAppending; class StreamEntry { @@ -167,7 +167,7 @@ public class BuildConsolePartitioner } } - private void warnOfContentChange(BuildConsoleStream stream) { + void warnOfContentChange(BuildConsoleStream stream) { if (stream != null) { ConsolePlugin.getDefault().getConsoleManager().warnOfContentChange(stream.getConsole()); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ConsoleEvent.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ConsoleEvent.java index 579724d545b..c87cc994da6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ConsoleEvent.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ConsoleEvent.java @@ -17,6 +17,11 @@ import org.eclipse.core.resources.IProject; public class ConsoleEvent extends EventObject implements IBuildConsoleEvent { + /** + * Comment for serialVersionUID + */ + private static final long serialVersionUID = 1L; + private IProject fProject; private int fType; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CParseTreeBuilder.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CParseTreeBuilder.java index 5d7d29fd9a7..c40b3fe4712 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CParseTreeBuilder.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CParseTreeBuilder.java @@ -40,7 +40,12 @@ public class CParseTreeBuilder extends SourceElementRequestorAdapter { /** * Syntax Error. */ - public class ParseError extends Error { + public class ParseError extends Error { + + /** + * Comment for serialVersionUID + */ + private static final long serialVersionUID = 1L; } public CParseTreeBuilder(CNode root, IDocument doc) { 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 29dd411647c..86f20a8c92e 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 @@ -53,6 +53,7 @@ import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; +import org.eclipse.jface.viewers.AbstractTreeViewer; import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IContentProvider; import org.eclipse.jface.viewers.IDoubleClickListener; @@ -884,7 +885,7 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha public void collapseAll() { viewer.getControl().setRedraw(false); - viewer.collapseToLevel(getViewPartInput(), TreeViewer.ALL_LEVELS); + viewer.collapseToLevel(getViewPartInput(), AbstractTreeViewer.ALL_LEVELS); viewer.getControl().setRedraw(true); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewDropAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewDropAdapter.java index 5475855507d..ffa4f8cea33 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewDropAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewDropAdapter.java @@ -16,6 +16,7 @@ import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ResourceAttributes; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.MultiStatus; @@ -139,11 +140,11 @@ class CViewDropAdapter extends PluginDropAdapter implements IOverwriteQuery { IResource tempResourceParent = tempResource.getParent(); //Apples to apples... IResource resourceCurrentContainer = currentContainer.getResource(); - + ResourceAttributes attributes = tempResource.getResourceAttributes(); if (tempResourceParent.equals(resourceCurrentContainer) || tempResource.equals(resourceCurrentContainer) || tempResource.equals(resourceCurrentContainer.getParent()) || - tempResource.isReadOnly()){ + attributes.isReadOnly()){ event.detail = DND.DROP_NONE; break; } @@ -303,8 +304,8 @@ class CViewDropAdapter extends PluginDropAdapter implements IOverwriteQuery { IStructuredSelection structuredSelection = (IStructuredSelection) selection; // loop through list and look for matching items - for (Iterator enum = structuredSelection.iterator(); enum.hasNext();) { - Object object = enum.next(); + for (Iterator enumarator = structuredSelection.iterator(); enumarator.hasNext();) { + Object object = enumarator.next(); IResource resource = null; if (object instanceof IResource) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java index 5ee71ee26a7..c887c05de46 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java @@ -168,7 +168,7 @@ public class MainActionGroup extends CViewActionGroup { IStructuredSelection resources = SelectionConverter.convertSelectionToResources(celements); if (resources.isEmpty()) { - new NewWizardMenu(menu, getCView().getSite().getWorkbenchWindow(), false); + new NewWizardMenu(getCView().getSite().getWorkbenchWindow()); menu.add(new Separator(IContextMenuConstants.GROUP_REORGANIZE)); refactoringActionGroup.fillContextMenu(menu); menu.add(new Separator()); @@ -223,7 +223,7 @@ public class MainActionGroup extends CViewActionGroup { void addNewMenu(IMenuManager menu, IStructuredSelection selection) { MenuManager newMenu = new MenuManager(CViewMessages.getString("NewWizardsActionGroup.new")); //$NON-NLS-1$ - new NewWizardMenu(newMenu, getCView().getSite().getWorkbenchWindow(), false); + new NewWizardMenu(getCView().getSite().getWorkbenchWindow()); menu.add(newMenu); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/PasteAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/PasteAction.java index 1bf68139a15..34176a651de 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/PasteAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/PasteAction.java @@ -54,7 +54,7 @@ public class PasteAction extends SelectionListenerAction { /** * System clipboard */ - private Clipboard clipboard; + Clipboard clipboard; /** * Creates a new action. @@ -153,8 +153,7 @@ public class PasteAction extends SelectionListenerAction { List selection = getSelectedResources(); if (selection.get(0) instanceof IFile) return ((IFile) selection.get(0)).getParent(); - else - return (IContainer) selection.get(0); + return (IContainer) selection.get(0); } /** * The PasteAction implementation of this diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusTool.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusTool.java index 89471bedd91..87a32de5e90 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusTool.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusTool.java @@ -48,9 +48,8 @@ public class StatusTool { public static IStatus getMoreSevere(IStatus s1, IStatus s2) { if (s1.getSeverity() > s2.getSeverity()) { return s1; - } else { - return s2; } + return s2; } /** * Finds the most severe status from a array of status diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusUtil.java index b1e959d5c1d..4ce5f5c7f01 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusUtil.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusUtil.java @@ -7,6 +7,7 @@ package org.eclipse.cdt.internal.ui.dialogs; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.dialogs.DialogPage; +import org.eclipse.jface.dialogs.IMessageProvider; /** * A utility class to work with IStatus. @@ -21,9 +22,8 @@ public class StatusUtil { public static IStatus getMoreSevere(IStatus s1, IStatus s2) { if (s1.getSeverity() > s2.getSeverity()) { return s1; - } else { - return s2; } + return s2; } /** @@ -52,15 +52,15 @@ public class StatusUtil { String message= status.getMessage(); switch (status.getSeverity()) { case IStatus.OK: - page.setMessage(message, DialogPage.NONE); + page.setMessage(message, IMessageProvider.NONE); page.setErrorMessage(null); break; case IStatus.WARNING: - page.setMessage(message, DialogPage.WARNING); + page.setMessage(message, IMessageProvider.WARNING); page.setErrorMessage(null); break; case IStatus.INFO: - page.setMessage(message, DialogPage.INFORMATION); + page.setMessage(message, IMessageProvider.INFORMATION); page.setErrorMessage(null); break; default: diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinerProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinerProvider.java index 9aad663f324..f69678bd37a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinerProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinerProvider.java @@ -22,7 +22,6 @@ import org.eclipse.cdt.core.model.IElementChangedListener; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.internal.ui.BaseCElementContentProvider; import org.eclipse.cdt.internal.ui.util.StringMatcher; -import org.eclipse.cdt.ui.IncludesGrouping; import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java index 41ceb26ede1..899f9fe02a4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java @@ -333,15 +333,12 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IS } if (PreferenceConstants.EDITOR_FOLDING_PROVIDER.equals(property)) { - if (asv instanceof ProjectionViewer) { - ProjectionViewer projectionViewer= (ProjectionViewer) asv; - if (fProjectionModelUpdater != null) - fProjectionModelUpdater.uninstall(); - // either freshly enabled or provider changed - fProjectionModelUpdater= CUIPlugin.getDefault().getFoldingStructureProviderRegistry().getCurrentFoldingProvider(); - if (fProjectionModelUpdater != null) { - fProjectionModelUpdater.install(this, projectionViewer); - } + if (fProjectionModelUpdater != null) + fProjectionModelUpdater.uninstall(); + // either freshly enabled or provider changed + fProjectionModelUpdater= CUIPlugin.getDefault().getFoldingStructureProviderRegistry().getCurrentFoldingProvider(); + if (fProjectionModelUpdater != null) { + fProjectionModelUpdater.install(this, asv); } return; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DocumentAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DocumentAdapter.java index 122779f434d..699a3403c91 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DocumentAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DocumentAdapter.java @@ -29,6 +29,7 @@ import org.eclipse.core.filebuffers.ITextFileBuffer; import org.eclipse.core.filebuffers.ITextFileBufferManager; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ResourceAttributes; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; @@ -361,7 +362,11 @@ public class DocumentAdapter implements IBuffer, IDocumentListener { */ public boolean isReadOnly() { IResource resource= getUnderlyingResource(); - return resource == null ? true : resource.isReadOnly(); + if (resource != null) { + ResourceAttributes attributes = resource.getResourceAttributes(); + return attributes.isReadOnly(); + } + return false; } /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/MouseClickListener.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/MouseClickListener.java index 3b3a59f7e5a..7f89765461d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/MouseClickListener.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/MouseClickListener.java @@ -420,63 +420,60 @@ IPropertyChangeListener{ //Allow for new lines if (start == end) return new Region(start, 0); - else{ - String selWord = null; - String slas = document.get(start,1); - if (slas.equals("\n") || //$NON-NLS-1$ + + String selWord = null; + String slas = document.get(start,1); + if (slas.equals("\n") || //$NON-NLS-1$ slas.equals("\t") || //$NON-NLS-1$ - slas.equals(" ")) //$NON-NLS-1$ - { - - selWord =document.get(start+1, end - start - 1); - } - else{ - selWord =document.get(start, end - start); - } - //Check for keyword - if (isKeyWord(selWord)) - return null; - //Avoid selecting literals, includes etc. - char charX = selWord.charAt(0); - if (charX == '"' || + slas.equals(" ")) //$NON-NLS-1$ + { + + selWord =document.get(start+1, end - start - 1); + } + else{ + selWord =document.get(start, end - start); + } + //Check for keyword + if (isKeyWord(selWord)) + return null; + //Avoid selecting literals, includes etc. + char charX = selWord.charAt(0); + if (charX == '"' || charX == '.' || charX == '<' || charX == '>') - return null; + return null; + + if (selWord.equals("#include")) //$NON-NLS-1$ + { + //get start of next identifier - if (selWord.equals("#include")) //$NON-NLS-1$ - { - //get start of next identifier + + int end2 = end; + + while (!Character.isJavaIdentifierPart(document.getChar(end2))){ + ++end2; - - int end2 = end; - - while (!Character.isJavaIdentifierPart(document.getChar(end2))){ - ++end2; - - } - - while (end2 < length){ - c = document.getChar(end2); - - if (!Character.isJavaIdentifierPart(c) && - c != '.') - break; - ++end2; - } - - int finalEnd = end2; - selWord =document.get(start, finalEnd - start); - end = finalEnd + 1; - start--; - fIncludeMode = true; } - + while (end2 < length){ + c = document.getChar(end2); + + if (!Character.isJavaIdentifierPart(c) && + c != '.') + break; + ++end2; + } - return new Region(start + 1, end - start - 1); + int finalEnd = end2; + selWord =document.get(start, finalEnd - start); + end = finalEnd + 1; + start--; + fIncludeMode = true; } + return new Region(start + 1, end - start - 1); + } catch (BadLocationException x) { return null; } @@ -509,9 +506,8 @@ IPropertyChangeListener{ if (viewer instanceof ITextViewerExtension5) { ITextViewerExtension5 extension= (ITextViewerExtension5) viewer; return extension.widgetOffset2ModelOffset(widgetOffset); - } else { - return widgetOffset + viewer.getVisibleRegion().getOffset(); } + return widgetOffset + viewer.getVisibleRegion().getOffset(); } catch (IllegalArgumentException e) { return -1; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmCodeScanner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmCodeScanner.java index 1bf6ba84d50..5647d04abb7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmCodeScanner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmCodeScanner.java @@ -109,12 +109,11 @@ public final class AsmCodeScanner extends AbstractCScanner { if(c != ':') { unreadBuffer(scanner); return fDefaultToken; - } else { - fBuffer.append((char) c); - IToken token= (IToken) fWords.get(":"); //$NON-NLS-1$ - if (token != null) - return token; } + fBuffer.append((char) c); + IToken token= (IToken) fWords.get(":"); //$NON-NLS-1$ + if (token != null) + return token; return fDefaultToken; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmPartitionScanner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmPartitionScanner.java index 3863111aff8..fd196089297 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmPartitionScanner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmPartitionScanner.java @@ -8,8 +8,8 @@ package org.eclipse.cdt.internal.ui.editor.asm; import java.util.ArrayList; import java.util.List; -import org.eclipse.cdt.internal.ui.text.CPartitionScanner; import org.eclipse.cdt.internal.ui.text.ICColorConstants; +import org.eclipse.cdt.internal.ui.text.ICPartitions; import org.eclipse.jface.text.rules.EndOfLineRule; import org.eclipse.jface.text.rules.ICharacterScanner; import org.eclipse.jface.text.rules.IPredicateRule; @@ -95,9 +95,9 @@ public class AsmPartitionScanner extends RuleBasedPartitionScanner { public AsmPartitionScanner() { super(); - IToken comment= new Token(CPartitionScanner.C_MULTILINE_COMMENT); - IToken single_comment= new Token(CPartitionScanner.C_SINGLE_LINE_COMMENT); - IToken string= new Token(CPartitionScanner.C_STRING); + IToken comment= new Token(ICPartitions.C_MULTILINE_COMMENT); + IToken single_comment= new Token(ICPartitions.C_SINGLE_LINE_COMMENT); + IToken string= new Token(ICPartitions.C_STRING); // IToken skip= new Token(SKIP); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmWordDetector.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmWordDetector.java index 5410d00951b..050ff5981e1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmWordDetector.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmWordDetector.java @@ -40,9 +40,8 @@ public class AsmWordDetector implements IWordDetector { } if(fStrictStart) { return (Character.isJavaIdentifierStart(c) || (c == fExtra)); - } else { - return (Character.isJavaIdentifierPart(c) || (c == fExtra)); } + return (Character.isJavaIdentifierPart(c) || (c == fExtra)); } /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java index 4760416483a..e57e102507f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java @@ -125,9 +125,8 @@ public abstract class OptionsConfigurationBlock { protected Map getOptions(boolean inheritCCoreOptions) { if (fProject != null) { return fProject.getOptions(inheritCCoreOptions); - } else { - return CCorePlugin.getOptions(); - } + } + return CCorePlugin.getOptions(); } protected Map getDefaultOptions() { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskConfigurationBlock.java index b5d4ae62554..dc64cf1ff93 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskConfigurationBlock.java @@ -86,16 +86,15 @@ public class TodoTaskConfigurationBlock extends OptionsConfigurationBlock { TodoTask task= (TodoTask) element; if (columnIndex == 0) { return task.name; - } else { - if (PRIORITY_HIGH.equals(task.priority)) { - return PreferencesMessages.getString("TodoTaskConfigurationBlock.markers.tasks.high.priority"); //$NON-NLS-1$ - } else if (PRIORITY_NORMAL.equals(task.priority)) { - return PreferencesMessages.getString("TodoTaskConfigurationBlock.markers.tasks.normal.priority"); //$NON-NLS-1$ - } else if (PRIORITY_LOW.equals(task.priority)) { - return PreferencesMessages.getString("TodoTaskConfigurationBlock.markers.tasks.low.priority"); //$NON-NLS-1$ - } - return ""; //$NON-NLS-1$ - } + } + if (PRIORITY_HIGH.equals(task.priority)) { + return PreferencesMessages.getString("TodoTaskConfigurationBlock.markers.tasks.high.priority"); //$NON-NLS-1$ + } else if (PRIORITY_NORMAL.equals(task.priority)) { + return PreferencesMessages.getString("TodoTaskConfigurationBlock.markers.tasks.normal.priority"); //$NON-NLS-1$ + } else if (PRIORITY_LOW.equals(task.priority)) { + return PreferencesMessages.getString("TodoTaskConfigurationBlock.markers.tasks.low.priority"); //$NON-NLS-1$ + } + return ""; //$NON-NLS-1$ } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractCScanner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractCScanner.java index b00c070511b..ba42147d92e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractCScanner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractCScanner.java @@ -207,8 +207,7 @@ public abstract class AbstractCScanner extends BufferedRuleBasedScanner { } if (read() == EOF) return Token.EOF; - else - return fDefaultToken; + return fDefaultToken; } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/BufferedDocumentScanner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/BufferedDocumentScanner.java index cfcd123c2a3..39599bda7be 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/BufferedDocumentScanner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/BufferedDocumentScanner.java @@ -105,10 +105,8 @@ public final class BufferedDocumentScanner implements ICharacterScanner { if (fOffset >= fBufferLength) { if (fBufferOffset + fBufferLength >= fRangeOffset + fRangeLength) return EOF; - else { - updateBuffer(fBufferOffset + fBufferLength); - fOffset= 0; - } + updateBuffer(fBufferOffset + fBufferLength); + fOffset= 0; } return fBuffer[fOffset++]; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CDoubleClickSelector.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CDoubleClickSelector.java index 0ea6dd1075d..b244e85e67f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CDoubleClickSelector.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CDoubleClickSelector.java @@ -87,14 +87,12 @@ public class CDoubleClickSelector implements ITextDoubleClickStrategy { fEndPos= searchForClosingBracket(fStartPos, prevChar, fgBrackets[bracketIndex1 + 1], doc); if (fEndPos > -1) return true; - else - fStartPos= -1; + fStartPos= -1; } else if (fEndPos > -1) { fStartPos= searchForOpenBracket(fEndPos, fgBrackets[bracketIndex2 - 1], nextChar, doc); if (fStartPos > -1) return true; - else - fEndPos= -1; + fEndPos= -1; } } catch (BadLocationException x) { } @@ -161,8 +159,7 @@ public class CDoubleClickSelector implements ITextDoubleClickStrategy { if (stack == 0) return closePos - 1; - else - return -1; + return -1; } @@ -183,8 +180,7 @@ public class CDoubleClickSelector implements ITextDoubleClickStrategy { if (stack == 0) return openPos + 1; - else - return -1; + return -1; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/COutlineInformationControl.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/COutlineInformationControl.java index 2372c493df6..5ccb4f1ffb8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/COutlineInformationControl.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/COutlineInformationControl.java @@ -1,7 +1,7 @@ /* * COutlineInformationControl.java 2004-12-14 / 08:17:41 - * $Revision:$ $Date:$ + * $Revision: 1.1 $ $Date: 2004/12/14 18:46:19 $ * * @author P.Tomaszewski */ @@ -83,37 +83,37 @@ public class COutlineInformationControl implements IInformationControl, private static final int MIN_WIDTH = 300; /** Source viewer which shows this control. */ - private CEditor fEditor; + CEditor fEditor; /** Shell for this control. */ - private Shell fShell; + Shell fShell; /** Control's composite. */ - private Composite fComposite; + Composite fComposite; /** Tree viewer used to display outline. */ - private TreeViewer fTreeViewer; + TreeViewer fTreeViewer; /** Text control for filter. */ private Text fFilterText; /** Content provider for tree control. */ - private IContentProvider fTreeContentProvider; + IContentProvider fTreeContentProvider; /** Sorter for tree viewer. */ private OutlineSorter fSorter; /** Control bounds. */ - private Rectangle fBounds; + Rectangle fBounds; /** Control trim. */ - private Rectangle fTrim; + Rectangle fTrim; /** Deactivation adapter. */ private Listener fDeactivateListener; /** This prevents to notify listener when it is adding. */ - private boolean fIsDeactivationActive; + boolean fIsDeactivationActive; /** Shell adapter, used for control deactivation. */ private ShellListener fShellListener; @@ -122,7 +122,7 @@ public class COutlineInformationControl implements IInformationControl, private ControlListener fControlListener; /** Should outline be sorted. */ - private boolean fSort = true; + boolean fSort = true; /** * Creates new outline control. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CPairMatcher.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CPairMatcher.java index 6f7dfc80381..1cda2227196 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CPairMatcher.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CPairMatcher.java @@ -114,15 +114,13 @@ public class CPairMatcher implements ICharacterPairMatcher { fStartPos= searchForOpeningPeer(fEndPos, fPairs[pairIndex2 - 1], fPairs[pairIndex2], fDocument); if (fStartPos > -1) return true; - else - fEndPos= -1; + fEndPos= -1; } else if (fStartPos > -1) { fAnchor= LEFT; fEndPos= searchForClosingPeer(fStartPos, fPairs[pairIndex1], fPairs[pairIndex1 + 1], fDocument); if (fEndPos > -1) return true; - else - fStartPos= -1; + fStartPos= -1; } } catch (BadLocationException x) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java index 179577c275e..1e2e64ec7d3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java @@ -160,16 +160,16 @@ public class CSourceViewerConfiguration extends SourceViewerConfiguration { //TextAttribute attr = new TextAttribute(manager.getColor(ICColorConstants.C_DEFAULT)); dr= new DefaultDamagerRepairer(getSinglelineCommentScanner()); - reconciler.setDamager(dr, CPartitionScanner.C_SINGLE_LINE_COMMENT); - reconciler.setRepairer(dr, CPartitionScanner.C_SINGLE_LINE_COMMENT); + reconciler.setDamager(dr, ICPartitions.C_SINGLE_LINE_COMMENT); + reconciler.setRepairer(dr, ICPartitions.C_SINGLE_LINE_COMMENT); dr= new DefaultDamagerRepairer(getStringScanner()); - reconciler.setDamager(dr, CPartitionScanner.C_STRING); - reconciler.setRepairer(dr, CPartitionScanner.C_STRING); + reconciler.setDamager(dr, ICPartitions.C_STRING); + reconciler.setRepairer(dr, ICPartitions.C_STRING); dr= new DefaultDamagerRepairer(getMultilineCommentScanner()); - reconciler.setDamager(dr, CPartitionScanner.C_MULTILINE_COMMENT); - reconciler.setRepairer(dr, CPartitionScanner.C_MULTILINE_COMMENT); + reconciler.setDamager(dr, ICPartitions.C_MULTILINE_COMMENT); + reconciler.setRepairer(dr, ICPartitions.C_MULTILINE_COMMENT); return reconciler; } @@ -192,7 +192,7 @@ public class CSourceViewerConfiguration extends SourceViewerConfiguration { ContentAssistPreference.configure(assistant, getPreferenceStore()); assistant.setProposalPopupOrientation(IContentAssistant.PROPOSAL_OVERLAY); - assistant.setContextInformationPopupOrientation(ContentAssistant.CONTEXT_INFO_ABOVE); + assistant.setContextInformationPopupOrientation(IContentAssistant.CONTEXT_INFO_ABOVE); assistant.setInformationControlCreator(getInformationControlCreator(sourceViewer)); return assistant; @@ -226,8 +226,9 @@ public class CSourceViewerConfiguration extends SourceViewerConfiguration { * @see SourceViewerConfiguration#getAutoIndentStrategy(ISourceViewer, String) */ public IAutoIndentStrategy getAutoIndentStrategy(ISourceViewer sourceViewer, String contentType) { - if(CPartitionScanner.C_MULTILINE_COMMENT.equals(contentType)) + if(ICPartitions.C_MULTILINE_COMMENT.equals(contentType)) { return new CCommentAutoIndentStrategy(); + } return new CAutoIndentStrategy(); } @@ -252,10 +253,12 @@ public class CSourceViewerConfiguration extends SourceViewerConfiguration { public String getDefaultPrefix(ISourceViewer sourceViewer, String contentType) { if(IDocument.DEFAULT_CONTENT_TYPE.equals(contentType)) return "//"; //$NON-NLS-1$ - if(CPartitionScanner.C_SINGLE_LINE_COMMENT.equals(contentType)) + if(ICPartitions.C_SINGLE_LINE_COMMENT.equals(contentType)) { return "//"; //$NON-NLS-1$ - if(CPartitionScanner.C_MULTILINE_COMMENT.equals(contentType)) + } + if(ICPartitions.C_MULTILINE_COMMENT.equals(contentType)) { return "//"; //$NON-NLS-1$ + } return null; } @@ -371,9 +374,9 @@ public class CSourceViewerConfiguration extends SourceViewerConfiguration { */ public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) { return new String[] { IDocument.DEFAULT_CONTENT_TYPE, - CPartitionScanner.C_MULTILINE_COMMENT, - CPartitionScanner.C_SINGLE_LINE_COMMENT, - CPartitionScanner.C_STRING }; + ICPartitions.C_MULTILINE_COMMENT, + ICPartitions.C_SINGLE_LINE_COMMENT, + ICPartitions.C_STRING }; } /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/FastCPartitionScanner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/FastCPartitionScanner.java index 020c800bcc1..b013aa35658 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/FastCPartitionScanner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/FastCPartitionScanner.java @@ -73,10 +73,9 @@ public class FastCPartitionScanner implements IPartitionTokenScanner, ICPartitio if (fCOffset != -1 && fTokenOffset + fTokenLength != fCOffset + fCLength) { fTokenOffset += fTokenLength; return fTokens[CCODE]; - } else { - fCOffset= -1; - fCLength= 0; } + fCOffset= -1; + fCLength= 0; } fTokenOffset += fTokenLength; @@ -92,11 +91,10 @@ public class FastCPartitionScanner implements IPartitionTokenScanner, ICPartitio fLast= NONE; // ignore last return preFix(fState, CCODE, NONE, 0); - } else { - fLast= NONE; - fPrefixLength= 0; - return Token.EOF; } + fLast= NONE; + fPrefixLength= 0; + return Token.EOF; case '\r': // emulate CPartitionScanner @@ -105,38 +103,36 @@ public class FastCPartitionScanner implements IPartitionTokenScanner, ICPartitio fTokenLength++; continue; - } else { - - switch (fState) { - case SINGLE_LINE_COMMENT: - case CHARACTER: - case STRING: - if (fTokenLength > 0) { - IToken token= fTokens[fState]; - - // emulate CPartitionScanner - if (fgEmulate) { - fTokenLength++; - fLast= NONE; - fPrefixLength= 0; - } else { - fLast= CARRIAGE_RETURN; - fPrefixLength= 1; - } - - fState= CCODE; - return token; - - } else { - consume(); - continue; - } - - default: - consume(); - continue; - } } + + switch (fState) { + case SINGLE_LINE_COMMENT: + case CHARACTER: + case STRING: + if (fTokenLength > 0) { + IToken token= fTokens[fState]; + + // emulate CPartitionScanner + if (fgEmulate) { + fTokenLength++; + fLast= NONE; + fPrefixLength= 0; + } else { + fLast= CARRIAGE_RETURN; + fPrefixLength= 1; + } + + fState= CCODE; + return token; + + } + consume(); + continue; + + default: + consume(); + continue; + } case '\n': switch (fState) { @@ -214,56 +210,48 @@ public class FastCPartitionScanner implements IPartitionTokenScanner, ICPartitio if (fLast == SLASH) { if (fTokenLength - getLastLength(fLast) > 0) { return preFix(CCODE, SINGLE_LINE_COMMENT, NONE, 2); - } else { - preFix(CCODE, SINGLE_LINE_COMMENT, NONE, 2); - fTokenOffset += fTokenLength; - fTokenLength= fPrefixLength; - break; - } - - } else { - fTokenLength++; - fLast= SLASH; + } + preFix(CCODE, SINGLE_LINE_COMMENT, NONE, 2); + fTokenOffset += fTokenLength; + fTokenLength= fPrefixLength; break; + } + fTokenLength++; + fLast= SLASH; + break; case '*': if (fLast == SLASH) { if (fTokenLength - getLastLength(fLast) > 0) return preFix(CCODE, MULTI_LINE_COMMENT, SLASH_STAR, 2); - else { - preFix(CCODE, MULTI_LINE_COMMENT, SLASH_STAR, 2); - fTokenOffset += fTokenLength; - fTokenLength= fPrefixLength; - break; - } - - } else { - consume(); + + preFix(CCODE, MULTI_LINE_COMMENT, SLASH_STAR, 2); + fTokenOffset += fTokenLength; + fTokenLength= fPrefixLength; break; + } + consume(); + break; case '\'': fLast= NONE; // ignore fLast if (fTokenLength > 0) return preFix(CCODE, CHARACTER, NONE, 1); - else { - preFix(CCODE, CHARACTER, NONE, 1); - fTokenOffset += fTokenLength; - fTokenLength= fPrefixLength; - break; - } + preFix(CCODE, CHARACTER, NONE, 1); + fTokenOffset += fTokenLength; + fTokenLength= fPrefixLength; + break; case '"': fLast= NONE; // ignore fLast if (fTokenLength > 0) return preFix(CCODE, STRING, NONE, 1); - else { - preFix(CCODE, STRING, NONE, 1); - fTokenOffset += fTokenLength; - fTokenLength= fPrefixLength; - break; - } + preFix(CCODE, STRING, NONE, 1); + fTokenOffset += fTokenLength; + fTokenLength= fPrefixLength; + break; default: consume(); @@ -285,10 +273,9 @@ public class FastCPartitionScanner implements IPartitionTokenScanner, ICPartitio case '/': if (fLast == STAR) { return postFix(MULTI_LINE_COMMENT); - } else { - consume(); - break; } + consume(); + break; default: consume(); @@ -307,10 +294,9 @@ public class FastCPartitionScanner implements IPartitionTokenScanner, ICPartitio if (fLast != BACKSLASH) { return postFix(STRING); - } else { - consume(); - break; - } + } + consume(); + break; default: consume(); @@ -329,10 +315,9 @@ public class FastCPartitionScanner implements IPartitionTokenScanner, ICPartitio if (fLast != BACKSLASH) { return postFix(CHARACTER); - } else { - consume(); - break; } + consume(); + break; default: consume(); @@ -388,14 +373,13 @@ public class FastCPartitionScanner implements IPartitionTokenScanner, ICPartitio fLast= last; return fTokens[state]; - } else { - fTokenLength -= getLastLength(fLast); - fLast= last; - fPrefixLength= prefixLength; - IToken token= fTokens[state]; - fState= newState; - return token; } + fTokenLength -= getLastLength(fLast); + fLast= last; + fPrefixLength= prefixLength; + IToken token= fTokens[state]; + fState= newState; + return token; } private static int getState(String contentType) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/LineBreakingReader.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/LineBreakingReader.java index ab2683af5cf..1a2c8762bf9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/LineBreakingReader.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/LineBreakingReader.java @@ -35,9 +35,8 @@ public class LineBreakingReader { if (nextWidth > fMaxWidth) { if (currWidth > 0) { return currOffset; - } else { - return nextOffset; } + return nextOffset; } currWidth= nextWidth; currOffset= nextOffset; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/PreprocessorRule.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/PreprocessorRule.java index 0ea5eeecdb8..6b5594f8ee8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/PreprocessorRule.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/PreprocessorRule.java @@ -115,11 +115,11 @@ public class PreprocessorRule extends WordRule implements IRule { return fDefaultToken; - } else { // Doesn't start with '#', roll back scanner - - for (int i = 0; i < nCharsToRollback; i++) { - scanner.unread(); - } + } + // Doesn't start with '#', roll back scanner + + for (int i = 0; i < nCharsToRollback; i++) { + scanner.unread(); } return Token.UNDEFINED; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SingleCharReader.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SingleCharReader.java index 4979ce16232..f895ee9d8ca 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SingleCharReader.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SingleCharReader.java @@ -27,9 +27,8 @@ public abstract class SingleCharReader extends Reader { if (ch == -1) { if (i == off) { return -1; - } else { - return i - off; } + return i - off; } cbuf[i]= (char)ch; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SingleTokenCScanner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SingleTokenCScanner.java index b5144a30e88..158fbe480e6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SingleTokenCScanner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SingleTokenCScanner.java @@ -68,9 +68,8 @@ public final class SingleTokenCScanner extends AbstractCScanner{ size = end - position; position = end; return fDefaultReturnToken; - } else { - return Token.EOF; } + return Token.EOF; } public int getTokenLength() { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SubstitutionTextReader.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SubstitutionTextReader.java index 178482a458f..501ca3b2846 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SubstitutionTextReader.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SubstitutionTextReader.java @@ -64,24 +64,23 @@ public abstract class SubstitutionTextReader extends SingleCharReader { fIndex= 0; } return ch; - } else { - int ch= fCharAfterWhiteSpace; - if (ch == -1) { - ch= fReader.read(); - } - if (Character.isWhitespace((char)ch)) { - do { - ch= fReader.read(); - } while (Character.isWhitespace((char)ch)); - if (ch != -1) { - fCharAfterWhiteSpace= ch; - return ' '; - } - } else { - fCharAfterWhiteSpace= -1; - } - return ch; } + int ch= fCharAfterWhiteSpace; + if (ch == -1) { + ch= fReader.read(); + } + if (Character.isWhitespace((char)ch)) { + do { + ch= fReader.read(); + } while (Character.isWhitespace((char)ch)); + if (ch != -1) { + fCharAfterWhiteSpace= ch; + return ' '; + } + } else { + fCharAfterWhiteSpace= -1; + } + return ch; } /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverDescriptor.java index 099c3172535..18ffb37097f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverDescriptor.java @@ -146,9 +146,8 @@ public class CEditorTextHoverDescriptor implements Comparable { int lastDot= label.lastIndexOf('.'); if (lastDot >= 0 && lastDot < label.length() - 1) { return label.substring(lastDot + 1); - } else { - return label; } + return label; } /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProposal.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProposal.java index 937c97621a2..8507cb44ba1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProposal.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProposal.java @@ -283,8 +283,8 @@ public class CCompletionProposal implements ICCompletionProposal, ICompletionPro if (event.character == fExitCharacter) { if (environment.anyPositionContains(offset)) return new ExitFlags(ILinkedModeListener.UPDATE_CARET, false); - else - return new ExitFlags(ILinkedModeListener.UPDATE_CARET, true); + + return new ExitFlags(ILinkedModeListener.UPDATE_CARET, true); } switch (event.character) { @@ -420,8 +420,7 @@ public class CCompletionProposal implements ICCompletionProposal, ICompletionPro int pos= string.indexOf('('); if (pos > 0) return string.subSequence(0, pos); - else - return string; + return string; } /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProposalComparator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProposalComparator.java index 69a1a1b7e0a..c0e1ee5acb4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProposalComparator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProposalComparator.java @@ -13,8 +13,7 @@ package org.eclipse.cdt.internal.ui.text.contentassist; import java.util.Comparator; -import org.eclipse.cdt.ui.text.*; -import org.eclipse.jface.text.contentassist.ICompletionProposal; +import org.eclipse.cdt.ui.text.ICCompletionProposal; public class CCompletionProposalComparator implements Comparator { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/CoreUtility.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/CoreUtility.java index 833e0f3ecd2..5ae7593e66d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/CoreUtility.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/CoreUtility.java @@ -53,23 +53,21 @@ public class CoreUtility { Bundle bundle = Platform.getBundle(id); if(bundle.getState() == org.osgi.framework.Bundle.ACTIVE) { return element.createExecutableExtension(classAttribute); - } else { - final Object[] ret = new Object[1]; - final CoreException[] exc = new CoreException[1]; - BusyIndicator.showWhile(null, new Runnable() { - public void run() { - try { - ret[0] = element.createExecutableExtension(classAttribute); - } catch (CoreException e) { - exc[0] = e; - } - } - }); - if (exc[0] != null) - throw exc[0]; - else - return ret[0]; } + final Object[] ret = new Object[1]; + final CoreException[] exc = new CoreException[1]; + BusyIndicator.showWhile(null, new Runnable() { + public void run() { + try { + ret[0] = element.createExecutableExtension(classAttribute); + } catch (CoreException e) { + exc[0] = e; + } + } + }); + if (exc[0] != null) + throw exc[0]; + return ret[0]; } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java index d0eba9d1b1c..65e88a38447 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java @@ -206,9 +206,8 @@ public class EditorUtility { IResource resource= unit.getResource(); if (resource instanceof IFile) { return new FileEditorInput((IFile) resource); - } else { - return new ExternalEditorInput(unit, getStorage(unit)); } + return new ExternalEditorInput(unit, getStorage(unit)); } if (element instanceof IBinary) { @@ -267,7 +266,7 @@ public class EditorUtility { if (cu.isWorkingCopy()) return cu; - return (ITranslationUnit)cu.findSharedWorkingCopy(CUIPlugin.getDefault().getBufferFactory()); + return cu.findSharedWorkingCopy(CUIPlugin.getDefault().getBufferFactory()); } @@ -300,9 +299,8 @@ public class EditorUtility { IEditorDescriptor descriptor = registry.getDefaultEditor(name); if (descriptor != null) { return descriptor.getId(); - } else { - return registry.findEditor(DEFAULT_TEXT_EDITOR_ID).getId(); } + return registry.findEditor(DEFAULT_TEXT_EDITOR_ID).getId(); } return null; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemMarkerManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemMarkerManager.java index 2af05290a0a..097d836477f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemMarkerManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemMarkerManager.java @@ -86,7 +86,7 @@ public class ProblemMarkerManager implements IResourceChangeListener, IAnnotatio } } - private ListenerList fListeners; + ListenerList fListeners; public ProblemMarkerManager() { fListeners = new ListenerList(5); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/Resources.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/Resources.java index e3dc87b4e4c..9d00ffa2a39 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/Resources.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/Resources.java @@ -23,6 +23,7 @@ import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceStatus; +import org.eclipse.core.resources.ResourceAttributes; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; @@ -99,8 +100,12 @@ public class Resources { List readOnlyFiles= new ArrayList(); for (int i= 0; i < resources.length; i++) { IResource resource= resources[i]; - if (resource.getType() == IResource.FILE && resource.isReadOnly()) - readOnlyFiles.add(resource); + if (resource.getType() == IResource.FILE) { + ResourceAttributes attributes = resource.getResourceAttributes(); + if (attributes.isReadOnly()) { + readOnlyFiles.add(resource); + } + } } if (readOnlyFiles.size() == 0) return new Status(IStatus.OK, CUIPlugin.getPluginId(), IStatus.OK, "", null); //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/StringMatcher.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/StringMatcher.java index 6dfa5c748e8..5217932e763 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/StringMatcher.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/StringMatcher.java @@ -178,10 +178,9 @@ public class StringMatcher { if (!fHasLeadingStar) { if (!regExpRegionMatches(text, start, current, 0, segLength)) { return false; - } else { - ++i; - tCurPos= tCurPos + segLength; } + ++i; + tCurPos= tCurPos + segLength; } /* process middle segments */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/TableLayoutComposite.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/TableLayoutComposite.java index 7d5cad85ae4..536982b72b4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/TableLayoutComposite.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/TableLayoutComposite.java @@ -69,7 +69,7 @@ public class TableLayoutComposite extends Composite { //---- Helpers ------------------------------------------------------------------------------------- - private Point computeTableSize(Table table) { + Point computeTableSize(Table table) { Point result= table.computeSize(SWT.DEFAULT, SWT.DEFAULT); int width= 0; @@ -91,7 +91,7 @@ public class TableLayoutComposite extends Composite { return result; } - private void layoutTable(Table table, int width, Rectangle area, boolean increase) { + void layoutTable(Table table, int width, Rectangle area, boolean increase) { // XXX: Layout is being called with an invalid value the first time // it is being called on Linux. This method resets the // Layout to null so we make sure we run it only when diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/TwoArrayQuickSort.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/TwoArrayQuickSort.java index 5ae29f2f8a1..31ba33dc8f7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/TwoArrayQuickSort.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/TwoArrayQuickSort.java @@ -50,8 +50,7 @@ public class TwoArrayQuickSort { private static boolean smaller(String left, String right, boolean ignoreCase) { if (ignoreCase) return left.compareToIgnoreCase(right) < 0; - else - return left.compareTo(right) < 0; + return left.compareTo(right) < 0; } /** * Sorts keys and values in parallel. 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 8bc02661da9..e6239e1fa08 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 @@ -207,9 +207,8 @@ public class CUILabelProvider extends LabelProvider implements IColorProvider { if (errortick) { if (extra == null) { return new ILabelDecorator[] {}; - } else { - return new ILabelDecorator[] { extra }; } + return new ILabelDecorator[] { extra }; } if (extra != null) { return new ILabelDecorator[] { extra }; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProblemsLabelDecorator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProblemsLabelDecorator.java index bbc5fd772a7..ed1096ba4cc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProblemsLabelDecorator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProblemsLabelDecorator.java @@ -337,7 +337,7 @@ public class ProblemsLabelDecorator implements ILabelDecorator, ILightweightLabe } } - private void fireProblemsChanged(IResource[] changedResources, boolean isMarkerChange) { + void fireProblemsChanged(IResource[] changedResources, boolean isMarkerChange) { if (fListeners != null && !fListeners.isEmpty()) { LabelProviderChangedEvent event= new ProblemsLabelChangedEvent(this, changedResources, isMarkerChange); Object[] listeners= fListeners.getListeners(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StatusBarUpdater.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StatusBarUpdater.java index 2f8eb354627..4fffc7e8f81 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StatusBarUpdater.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StatusBarUpdater.java @@ -58,15 +58,14 @@ public class StatusBarUpdater implements ISelectionChangedListener { int nElements= selection.size(); if (nElements > 1) { return CUIMessages.getFormattedString("StatusBarUpdater.num_elements_selected", String.valueOf(nElements)); //$NON-NLS-1$ - } else { - Object elem= selection.getFirstElement(); - if (elem instanceof ICElement) { - return formatCElementMessage((ICElement) elem); - } else if (elem instanceof ITypeInfo) { - return formatTypeInfoMessage((ITypeInfo) elem); - } else if (elem instanceof IResource) { - return formatResourceMessage((IResource) elem); - } + } + Object elem= selection.getFirstElement(); + if (elem instanceof ICElement) { + return formatCElementMessage((ICElement) elem); + } else if (elem instanceof ITypeInfo) { + return formatTypeInfoMessage((ITypeInfo) elem); + } else if (elem instanceof IResource) { + return formatResourceMessage((IResource) elem); } } return ""; //$NON-NLS-1$ @@ -84,8 +83,7 @@ public class StatusBarUpdater implements ISelectionChangedListener { IContainer parent= element.getParent(); if (parent != null && parent.getType() != IResource.ROOT) return element.getName() + CElementLabels.CONCAT_STRING + parent.getFullPath().makeRelative().toString(); - else - return element.getName(); + return element.getName(); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/AbstractOpenWizardAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/AbstractOpenWizardAction.java index d17f7e628f2..6f45db24ed7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/AbstractOpenWizardAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/AbstractOpenWizardAction.java @@ -123,16 +123,15 @@ public abstract class AbstractOpenWizardAction extends Action implements IWorkbe ISelection selection= window.getSelectionService().getSelection(); if (selection instanceof IStructuredSelection) { return (IStructuredSelection) selection; - } else { - // Build the selection from the IFile of the editor - IWorkbenchPart part = window.getPartService().getActivePart(); - if (part instanceof IEditorPart) { - IEditorInput input = ((IEditorPart) part).getEditorInput(); - if (input instanceof IFileEditorInput) { - IFile file = ((IFileEditorInput) input).getFile(); - if (file != null) - return new StructuredSelection(file); - } + } + // Build the selection from the IFile of the editor + IWorkbenchPart part = window.getPartService().getActivePart(); + if (part instanceof IEditorPart) { + IEditorInput input = ((IEditorPart) part).getEditorInput(); + if (input instanceof IFileEditorInput) { + IFile file = ((IFileEditorInput) input).getFile(); + if (file != null) + return new StructuredSelection(file); } } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/CWizardRegistry.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/CWizardRegistry.java index c401297978d..e2b19534ec6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/CWizardRegistry.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/CWizardRegistry.java @@ -119,10 +119,9 @@ public class CWizardRegistry { } } return false; - } else { - // fall back, if no element found then assume it's a project wizard - return true; } + // fall back, if no element found then assume it's a project wizard + return true; } public static IAction[] getProjectWizardActions() { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/BaseClassesLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/BaseClassesLabelProvider.java index 6214bcf4f72..159a156e6bf 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/BaseClassesLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/BaseClassesLabelProvider.java @@ -34,8 +34,7 @@ public final class BaseClassesLabelProvider implements ITableLabelProvider { return ACCESS_PRIVATE; if (access == ASTAccessVisibility.PROTECTED) return ACCESS_PROTECTED; - else - return ACCESS_PUBLIC; + return ACCESS_PUBLIC; } private static TypeInfoLabelProvider fTypeInfoLabelProvider = new TypeInfoLabelProvider(TypeInfoLabelProvider.SHOW_FULLY_QUALIFIED); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/BaseClassesListDialogField.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/BaseClassesListDialogField.java index 55d2371d352..09f61997279 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/BaseClassesListDialogField.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/BaseClassesListDialogField.java @@ -58,10 +58,9 @@ public class BaseClassesListDialogField extends ListDialogField { return INDEX_PUBLIC; } } else if (property.equals(CP_VIRTUAL)) { - if (baseClass.isVirtual()) - return INDEX_YES; - else - return INDEX_NO; + if (baseClass.isVirtual()) + return INDEX_YES; + return INDEX_NO; } return null; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/ConstructorMethodStub.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/ConstructorMethodStub.java index dc020709d67..a1e3d3b4297 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/ConstructorMethodStub.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/ConstructorMethodStub.java @@ -41,22 +41,21 @@ public final class ConstructorMethodStub extends AbstractMethodStub { public String createMethodImplementation(IQualifiedTypeName className, IBaseClassInfo[] baseClasses, String lineDelimiter) { //TODO should use code templates - if (fIsInline) + if (fIsInline) { return ""; //$NON-NLS-1$ - else { - StringBuffer buf = new StringBuffer(); - buf.append(className.toString()); - buf.append("::"); //$NON-NLS-1$ - buf.append(className.toString()); - buf.append("()"); //$NON-NLS-1$ - buf.append(lineDelimiter); - buf.append('{'); - buf.append(lineDelimiter); - //buf.append("// TODO Auto-generated constructor stub"); - //buf.append(lineDelimiter); - buf.append('}'); - return buf.toString(); } + StringBuffer buf = new StringBuffer(); + buf.append(className.toString()); + buf.append("::"); //$NON-NLS-1$ + buf.append(className.toString()); + buf.append("()"); //$NON-NLS-1$ + buf.append(lineDelimiter); + buf.append('{'); + buf.append(lineDelimiter); + //buf.append("// TODO Auto-generated constructor stub"); + //buf.append(lineDelimiter); + buf.append('}'); + return buf.toString(); } public boolean isConstructor() { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/DestructorMethodStub.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/DestructorMethodStub.java index c4894128654..00e9a7451e5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/DestructorMethodStub.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/DestructorMethodStub.java @@ -45,22 +45,21 @@ public final class DestructorMethodStub extends AbstractMethodStub { public String createMethodImplementation(IQualifiedTypeName className, IBaseClassInfo[] baseClasses, String lineDelimiter) { //TODO should use code templates - if (fIsInline) - return ""; //$NON-NLS-1$ - else { - StringBuffer buf = new StringBuffer(); - buf.append(className.toString()); - buf.append("::~"); //$NON-NLS-1$ - buf.append(className.toString()); - buf.append("()"); //$NON-NLS-1$ - buf.append(lineDelimiter); - buf.append('{'); - buf.append(lineDelimiter); - //buf.append("// TODO Auto-generated destructor stub"); - //buf.append(lineDelimiter); - buf.append('}'); - return buf.toString(); - } + if (fIsInline) { + return ""; //$NON-NLS-1$ + } + StringBuffer buf = new StringBuffer(); + buf.append(className.toString()); + buf.append("::~"); //$NON-NLS-1$ + buf.append(className.toString()); + buf.append("()"); //$NON-NLS-1$ + buf.append(lineDelimiter); + buf.append('{'); + buf.append(lineDelimiter); + //buf.append("// TODO Auto-generated destructor stub"); + //buf.append(lineDelimiter); + buf.append('}'); + return buf.toString(); } public boolean isDestructor() { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/MethodStubsListDialogField.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/MethodStubsListDialogField.java index 3ab11764eba..a6fa36bfd19 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/MethodStubsListDialogField.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/MethodStubsListDialogField.java @@ -69,15 +69,13 @@ public class MethodStubsListDialogField extends CheckedListDialogField { return INDEX_PUBLIC; } } else if (property.equals(CP_VIRTUAL)) { - if (stub.isVirtual()) - return INDEX_YES; - else - return INDEX_NO; + if (stub.isVirtual()) + return INDEX_YES; + return INDEX_NO; } else if (property.equals(CP_INLINE)) { - if (stub.isInline()) - return INDEX_YES; - else - return INDEX_NO; + if (stub.isInline()) + return INDEX_YES; + return INDEX_NO; } return null; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java index c6a39618f25..f67c3584c99 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java @@ -675,33 +675,32 @@ public class NewClassCodeGenerator { int includePos = contents.indexOf(include, startPos); if (includePos == -1) { return false; - } else { - if (includePos == startPos) { - return true; - } - - // TODO detect if it's commented out - - // make sure it's on a line by itself - int linePos = findFirstLineChar(contents, includePos); - if (linePos == -1 || linePos == includePos) { - return true; - } - boolean badLine = false; - for (int pos = linePos; pos < includePos; ++pos) { - char c = contents.charAt(pos); - if (!Character.isWhitespace(c)) { - badLine = true; - break; - } - } - if (!badLine) { - return true; - } - - // keep searching - startPos = includePos + include.length(); } + if (includePos == startPos) { + return true; + } + + // TODO detect if it's commented out + + // make sure it's on a line by itself + int linePos = findFirstLineChar(contents, includePos); + if (linePos == -1 || linePos == includePos) { + return true; + } + boolean badLine = false; + for (int pos = linePos; pos < includePos; ++pos) { + char c = contents.charAt(pos); + if (!Character.isWhitespace(c)) { + badLine = true; + break; + } + } + if (!badLine) { + return true; + } + + // keep searching + startPos = includePos + include.length(); } return false; } @@ -802,9 +801,8 @@ public class NewClassCodeGenerator { if (c == '\n' || c == '\r') { if (linePos + 1 < startPos) { return linePos + 1; - } else { - return -1; } + return -1; } --linePos; }