diff options
author | Alain Magloire | 2004-12-24 15:24:05 +0000 |
---|---|---|
committer | Alain Magloire | 2004-12-24 15:24:05 +0000 |
commit | 8fc3226f2dd9c562d9d7a135f77c5376a65253c5 (patch) | |
tree | cda482305bea0a7e4fdbec91b41d19531d3ea835 | |
parent | 3e04941539e4d0626846ca8ead1e65f6f19c81be (diff) | |
download | org.eclipse.cdt-8fc3226f2dd9c562d9d7a135f77c5376a65253c5.tar.gz org.eclipse.cdt-8fc3226f2dd9c562d9d7a135f77c5376a65253c5.tar.xz org.eclipse.cdt-8fc3226f2dd9c562d9d7a135f77c5376a65253c5.zip |
warning scrubs
17 files changed, 66 insertions, 86 deletions
diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/CBrowsingPart.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/CBrowsingPart.java index 81a01256fa6..e2be686e0cc 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/CBrowsingPart.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/CBrowsingPart.java @@ -142,7 +142,7 @@ public abstract class CBrowsingPart extends ViewPart implements IMenuListener, I * Ensure selection changed events being processed only if * initiated by user interaction with this part. */ - private boolean fProcessSelectionEvents= true; + boolean fProcessSelectionEvents= true; private IPartListener2 fPartListener= new IPartListener2() { public void partActivated(IWorkbenchPartReference ref) { @@ -552,7 +552,7 @@ public abstract class CBrowsingPart extends ViewPart implements IMenuListener, I fToggleLinkingAction= new ToggleLinkingAction(this); } - private void doWorkingSetChanged(PropertyChangeEvent event) { + void doWorkingSetChanged(PropertyChangeEvent event) { String property= event.getProperty(); if (IWorkingSetManager.CHANGE_WORKING_SET_NAME_CHANGE.equals(property)) updateTitle(); @@ -685,8 +685,7 @@ public abstract class CBrowsingPart extends ViewPart implements IMenuListener, I if((newInput instanceof List) && (part instanceof NamespacesView)) return true; - else - return false; + return false; } private boolean isInputResetBy(IWorkbenchPart part) { @@ -704,8 +703,7 @@ public abstract class CBrowsingPart extends ViewPart implements IMenuListener, I if ((thisInput instanceof ICElement || thisInput instanceof ITypeInfo) && (partInput instanceof ICElement || partInput instanceof ITypeInfo)) return getTypeComparator().compare(partInput, thisInput) > 0; - else - return true; + return true; } protected boolean isAncestorOf(Object ancestor, Object element) { @@ -729,8 +727,7 @@ public abstract class CBrowsingPart extends ViewPart implements IMenuListener, I private boolean internalIsAncestorOf(ICElement ancestor, ICElement element) { if (element != null) return element.equals(ancestor) || internalIsAncestorOf(ancestor, element.getParent()); - else - return false; + return false; } private boolean isSearchResultView(IWorkbenchPart part) { @@ -1300,8 +1297,7 @@ public abstract class CBrowsingPart extends ViewPart implements IMenuListener, I ICElement[] types = TypeUtil.getTypes(tu); if (types.length > 0) return types[0]; - else - return null; + return null; } catch (CModelException ex) { return null; } @@ -1326,21 +1322,21 @@ public abstract class CBrowsingPart extends ViewPart implements IMenuListener, I IContainer parent= ((IFile)firstElement).getParent(); if (parent != null) return (ICElement)parent.getAdapter(ICElement.class); - else return null; - } else - return je; - - } else - return firstElement; + return null; + } + return je; + } + return firstElement; } Object currentInput= getViewer().getInput(); - if (currentInput == null || !currentInput.equals(findInputForElement(firstElement))) - if (iter.hasNext()) + if (currentInput == null || !currentInput.equals(findInputForElement(firstElement))) { + if (iter.hasNext()) { // multi selection and view is empty return null; - else - // ok: single selection and view is empty - return firstElement; + } + // ok: single selection and view is empty + return firstElement; + } // be nice to multi selection while (iter.hasNext()) { @@ -1365,7 +1361,7 @@ public abstract class CBrowsingPart extends ViewPart implements IMenuListener, I /** * Links to editor (if option enabled) */ - private void linkToEditor(IStructuredSelection selection) { + void linkToEditor(IStructuredSelection selection) { Object obj= selection.getFirstElement(); if (selection.size() == 1) { @@ -1379,7 +1375,7 @@ public abstract class CBrowsingPart extends ViewPart implements IMenuListener, I } } - private void setSelectionFromEditor(IWorkbenchPartReference ref) { + void setSelectionFromEditor(IWorkbenchPartReference ref) { IWorkbenchPart part= ref.getPart(false); setSelectionFromEditor(part); } @@ -1486,15 +1482,14 @@ public abstract class CBrowsingPart extends ViewPart implements IMenuListener, I ITranslationUnit unit= manager.getWorkingCopy(input); if (unit != null) try { - if (unit.isConsistent()) + if (unit.isConsistent()) { return unit.getElementAtOffset(offset); - else { - /* - * XXX: We should set the selection later when the - * CU is reconciled. - * see https://bugs.eclipse.org/bugs/show_bug.cgi?id=51290 - */ } + /* + * XXX: We should set the selection later when the + * CU is reconciled. + * see https://bugs.eclipse.org/bugs/show_bug.cgi?id=51290 + */ } catch (CModelException ex) { // fall through } diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/LexicalSortingAction.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/LexicalSortingAction.java index 7d357d4e401..11441e51229 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/LexicalSortingAction.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/LexicalSortingAction.java @@ -23,8 +23,8 @@ import org.eclipse.ui.help.WorkbenchHelp; * which should be renamed to MemberActionsGroup */ public class LexicalSortingAction extends Action { - private CBrowsingViewerSorter fSorter= new CBrowsingViewerSorter(); - private StructuredViewer fViewer; + CBrowsingViewerSorter fSorter= new CBrowsingViewerSorter(); + StructuredViewer fViewer; private String fPreferenceKey; public LexicalSortingAction(StructuredViewer viewer, String id) { diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/MembersView.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/MembersView.java index d0884f3278e..65d5bc9644b 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/MembersView.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/MembersView.java @@ -242,8 +242,7 @@ public class MembersView extends CBrowsingPart implements IPropertyChangeListene ICElement type= TypeUtil.getDeclaringType(celem); if (type == null || type instanceof INamespace) return AllTypesCache.getTypeForElement(celem, true, true, null); - else - return findInputForElement(type); + return findInputForElement(type); } else if (TypeUtil.isMemberType(celem)) { return findInputForElement(TypeUtil.getDeclaringType(celem)); } else { diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/MembersViewContentProvider.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/MembersViewContentProvider.java index 4e12580e4a6..6fd97569858 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/MembersViewContentProvider.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/MembersViewContentProvider.java @@ -79,14 +79,13 @@ class MembersViewContentProvider extends CBrowsingContentProvider { ICElement elem = AllTypesCache.getElementForType(info, true, true, null); if (elem == null) { return ERROR_NO_CHILDREN; - } else { - if (elem instanceof IParent) { - ICElement[] children = ((IParent)elem).getChildren(); - if (children != null && children.length > 0) - return children; - } - return EMPTY_CHILDREN; } + if (elem instanceof IParent) { + ICElement[] children = ((IParent)elem).getChildren(); + if (children != null && children.length > 0) + return children; + } + return EMPTY_CHILDREN; } if (element instanceof IParent) { diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/NamespacesView.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/NamespacesView.java index f31d13a8bdf..a4298f1e224 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/NamespacesView.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/NamespacesView.java @@ -237,9 +237,8 @@ public class NamespacesView extends CBrowsingPart { ITypeInfo info = (ITypeInfo) element; if (info.getCElementType() == ICElement.C_NAMESPACE && info.exists()) { return info; - } else { - return info.getEnclosingNamespace(true); } + return info.getEnclosingNamespace(true); } return null; diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/NamespacesViewContentProvider.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/NamespacesViewContentProvider.java index f40e8559e63..f6c9dd97fd7 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/NamespacesViewContentProvider.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/NamespacesViewContentProvider.java @@ -113,10 +113,9 @@ class NamespacesViewContentProvider extends CBrowsingContentProvider { ITypeInfo info = (ITypeInfo)element; if (info.isEnclosedType()) { return info.getEnclosingType(); - } else { -// return info.getEnclosingProject(); - return null; } +// return info.getEnclosingProject(); + return null; } return null; diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/TypeInfoSorter.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/TypeInfoSorter.java index bbf6d7eb80a..235793ad473 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/TypeInfoSorter.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/TypeInfoSorter.java @@ -32,13 +32,12 @@ public class TypeInfoSorter extends CBrowsingViewerSorter { return NAMESPACES_RESERVED; } return NAMESPACES; - } else { - if (name.startsWith("__")) { //$NON-NLS-1$ - return CELEMENTS_SYSTEM; - } - if (name.charAt(0) == '_') { - return CELEMENTS_RESERVED; - } + } + if (name.startsWith("__")) { //$NON-NLS-1$ + return CELEMENTS_SYSTEM; + } + if (name.charAt(0) == '_') { + return CELEMENTS_RESERVED; } return CELEMENTS; } diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/TypesViewContentProvider.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/TypesViewContentProvider.java index 32b141fb022..39448be557c 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/TypesViewContentProvider.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/TypesViewContentProvider.java @@ -90,10 +90,9 @@ class TypesViewContentProvider extends CBrowsingContentProvider { ITypeInfo info = (ITypeInfo)element; if (info.isEnclosedType()) { return info.getEnclosingType(); - } else { -// return info.getEnclosingProject(); - return null; } +// return info.getEnclosingProject(); + return null; } return null; diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/HierarchyViewerSorter.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/HierarchyViewerSorter.java index e9523d9acf4..9f7a346ac17 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/HierarchyViewerSorter.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/HierarchyViewerSorter.java @@ -133,11 +133,10 @@ public class HierarchyViewerSorter extends ViewerSorter { } } return fNormalSorter.compare(viewer, e1, e2); // use appearance pref page settings - } else { - String name1= ((ICElement) e1).getElementName(); //$NON-NLS-1$ - String name2= ((ICElement) e2).getElementName(); //$NON-NLS-1$ - return getCollator().compare(name1, name2); } + String name1= ((ICElement) e1).getElementName(); //$NON-NLS-1$ + String name2= ((ICElement) e2).getElementName(); //$NON-NLS-1$ + return getCollator().compare(name1, name2); } private ICElement getDefiningType(ITypeHierarchy hierarchy, IMethodDeclaration method) throws CModelException { diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/OpenTypeHierarchyUtil.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/OpenTypeHierarchyUtil.java index 137a5dd668b..edb42c446c1 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/OpenTypeHierarchyUtil.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/OpenTypeHierarchyUtil.java @@ -60,9 +60,8 @@ public class OpenTypeHierarchyUtil { try { if (PreferenceConstants.OPEN_TYPE_HIERARCHY_IN_PERSPECTIVE.equals(PreferenceConstants.getPreferenceStore().getString(PreferenceConstants.OPEN_TYPE_HIERARCHY))) { return openInPerspective(window, input); - } else { - return openInViewPart(window, input); } + return openInViewPart(window, input); } catch (WorkbenchException e) { ExceptionHandler.handle(e, window.getShell(), diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/OpenTypeInHierarchyAction.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/OpenTypeInHierarchyAction.java index 3bddab3cd4e..1c5591dab37 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/OpenTypeInHierarchyAction.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/OpenTypeInHierarchyAction.java @@ -16,7 +16,6 @@ import org.eclipse.cdt.core.browser.AllTypesCache; import org.eclipse.cdt.core.browser.ITypeInfo; import org.eclipse.cdt.core.browser.ITypeSearchScope; import org.eclipse.cdt.core.browser.TypeSearchScope; -import org.eclipse.cdt.core.browser.TypeUtil; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.internal.ui.browser.opentype.OpenTypeDialog; import org.eclipse.cdt.internal.ui.browser.opentype.OpenTypeMessages; diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/SubTypeHierarchyViewer.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/SubTypeHierarchyViewer.java index 8f268da67d8..dcd7d2bb866 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/SubTypeHierarchyViewer.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/SubTypeHierarchyViewer.java @@ -35,9 +35,8 @@ public class SubTypeHierarchyViewer extends TypeHierarchyViewer { public String getTitle() { if (isMethodFiltering()) { return TypeHierarchyMessages.getString("SubTypeHierarchyViewer.filtered.title"); //$NON-NLS-1$ - } else { - return TypeHierarchyMessages.getString("SubTypeHierarchyViewer.title"); //$NON-NLS-1$ } + return TypeHierarchyMessages.getString("SubTypeHierarchyViewer.title"); //$NON-NLS-1$ } /* diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/SuperTypeHierarchyViewer.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/SuperTypeHierarchyViewer.java index b8c05eed9e7..0c102d9b878 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/SuperTypeHierarchyViewer.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/SuperTypeHierarchyViewer.java @@ -35,9 +35,8 @@ public class SuperTypeHierarchyViewer extends TypeHierarchyViewer { public String getTitle() { if (isMethodFiltering()) { return TypeHierarchyMessages.getString("SuperTypeHierarchyViewer.filtered.title"); //$NON-NLS-1$ - } else { - return TypeHierarchyMessages.getString("SuperTypeHierarchyViewer.title"); //$NON-NLS-1$ } + return TypeHierarchyMessages.getString("SuperTypeHierarchyViewer.title"); //$NON-NLS-1$ } /* diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/TypeHierarchyContentProvider.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/TypeHierarchyContentProvider.java index f809bbcda85..18247ee5dfc 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/TypeHierarchyContentProvider.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/TypeHierarchyContentProvider.java @@ -224,9 +224,8 @@ public abstract class TypeHierarchyContentProvider implements ITreeContentProvid if (isInScope(type)) { if (fMemberFilter != null) { return hasMemberFilterChildren(type) || hasTypeChildren(type); - } else { - return true; } + return true; } return hasTypeChildren(type); } diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/TypeHierarchyLifeCycle.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/TypeHierarchyLifeCycle.java index 87918f78ab0..df2b5fae870 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/TypeHierarchyLifeCycle.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/TypeHierarchyLifeCycle.java @@ -186,12 +186,11 @@ public class TypeHierarchyLifeCycle implements ITypeHierarchyChangedListener, IE if (fHierarchyRefreshNeeded) { return; - } else { - ArrayList changedTypes= new ArrayList(); - processDelta(event.getDelta(), changedTypes); - if (changedTypes.size() > 0) { - fireChange((ICElement[]) changedTypes.toArray(new ICElement[changedTypes.size()])); - } + } + ArrayList changedTypes= new ArrayList(); + processDelta(event.getDelta(), changedTypes); + if (changedTypes.size() > 0) { + fireChange((ICElement[]) changedTypes.toArray(new ICElement[changedTypes.size()])); } } diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/TypeHierarchyViewPart.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/TypeHierarchyViewPart.java index c0fae008a0b..25eba661563 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/TypeHierarchyViewPart.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/TypeHierarchyViewPart.java @@ -987,9 +987,8 @@ public class TypeHierarchyViewPart extends ViewPart implements ITypeHierarchyVie private ICElement getSelectableType(ICElement elem) { if (!TypeUtil.isClassOrStruct(elem)) { return getCurrentViewer().getTreeRootType(); - } else { - return elem; } + return elem; } private void internalSelectType(ICElement elem, boolean reveal) { diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoLabelProvider.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoLabelProvider.java index 7e3f610338a..231dfff7d51 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoLabelProvider.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoLabelProvider.java @@ -107,17 +107,16 @@ public class TypeInfoLabelProvider extends LabelProvider { ITypeInfo parentInfo = typeRef.getEnclosingType(); if (parentInfo != null) { return getTypeIcon(parentInfo.getCElementType()); - } else { - IPath path = null; - ITypeReference ref = typeRef.getResolvedReference(); - if (ref != null) { - path = ref.getPath(); - if (CoreModel.isValidHeaderUnitName(typeRef.getEnclosingProject(), path.lastSegment())) { - return HEADER_ICON; - } + } + IPath path = null; + ITypeReference ref = typeRef.getResolvedReference(); + if (ref != null) { + path = ref.getPath(); + if (CoreModel.isValidHeaderUnitName(typeRef.getEnclosingProject(), path.lastSegment())) { + return HEADER_ICON; } - return SOURCE_ICON; } + return SOURCE_ICON; } return getTypeIcon(typeRef.getCElementType()); |