mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-29 03:45:35 +02:00
Code Issues Wiki Activity

warning scrubs

Browse source
This commit is contained in:
Alain Magloire 2004-12-24 15:24:05 +00:00
parent 3e04941539
commit 8fc3226f2d
17 changed files with 67 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/CBrowsingPart.java
View file

@ -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
}

4
core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/LexicalSortingAction.java
View file

@ -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) {

3
core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/MembersView.java
View file

@ -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 {

13
core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/MembersViewContentProvider.java
View file

@ -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) {

3
core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/NamespacesView.java
View file

@ -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;

5
core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/NamespacesViewContentProvider.java
View file

@ -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;

13
core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/TypeInfoSorter.java
View file

@ -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;
}

5
core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/cbrowsing/TypesViewContentProvider.java
View file

@ -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;

7
core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/HierarchyViewerSorter.java
View file

@ -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 {

3
core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/OpenTypeHierarchyUtil.java
View file

@ -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(),

1
core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/OpenTypeInHierarchyAction.java
View file

@ -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;

3
core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/SubTypeHierarchyViewer.java
View file

@ -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$
}
/*

3
core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/SuperTypeHierarchyViewer.java
View file

@ -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$
}
/*

3
core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/TypeHierarchyContentProvider.java
View file

@ -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);
}

11
core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/TypeHierarchyLifeCycle.java
View file

@ -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()]));
}
}

3
core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/TypeHierarchyViewPart.java
View file

@ -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) {

19
core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoLabelProvider.java
View file

@ -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;
}
}
return SOURCE_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 getTypeIcon(typeRef.getCElementType());