From cd81b282d5749c3249559e07cc3122d79bd78f2d Mon Sep 17 00:00:00 2001 From: Markus Schorn Date: Tue, 13 Jan 2009 13:32:47 +0000 Subject: [PATCH] Fix warnings. --- .../org/eclipse/cdt/core/parser/util/ASTPrinter.java | 7 ++++--- .../eclipse/cdt/internal/core/parser/util/WeakHashSet.java | 2 +- .../cdt/internal/core/pdom/TeamPDOMImportOperation.java | 2 +- .../eclipse/cdt/internal/ui/editor/CDocumentProvider.java | 4 ++-- .../ui/preferences/CodeTemplatePreferencePage.java | 2 +- .../internal/ui/preferences/PropertyAndPreferencePage.java | 2 +- .../ui/text/spelling/engine/AbstractSpellDictionary.java | 4 ++-- .../cdt/internal/ui/viewsupport/ListContentProvider.java | 2 +- .../src/org/eclipse/cdt/ui/newui/EnvironmentTab.java | 2 +- 9 files changed, 14 insertions(+), 13 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/ASTPrinter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/ASTPrinter.java index 18fe10f1301..fb74a6adf79 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/ASTPrinter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/ASTPrinter.java @@ -203,10 +203,11 @@ public class ASTPrinter { IASTDeclarator declarator = (IASTDeclarator) n; IASTPointerOperator[] pointers = declarator.getPointerOperators(); - if(pointers != null && pointers.length > 0) + if(pointers != null && pointers.length > 0) { out.println(); - for (IASTPointerOperator pointer : pointers) { - print(out, indentLevel+1, pointer); + for (IASTPointerOperator pointer : pointers) { + print(out, indentLevel+1, pointer); + } } if (declarator instanceof IASTArrayDeclarator) { IASTArrayDeclarator decl = (IASTArrayDeclarator)declarator; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/WeakHashSet.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/WeakHashSet.java index be3334096ee..6dffbbea534 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/WeakHashSet.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/WeakHashSet.java @@ -27,7 +27,7 @@ public class WeakHashSet { } @Override public boolean equals(Object obj) { - if (!(obj instanceof HashableWeakReference)) return false; + if (!(obj instanceof HashableWeakReference)) return false; Object referent = get(); Object other = ((HashableWeakReference) obj).get(); if (referent == null) return other == null; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/TeamPDOMImportOperation.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/TeamPDOMImportOperation.java index 8622894baf4..4aa453d5984 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/TeamPDOMImportOperation.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/TeamPDOMImportOperation.java @@ -178,7 +178,7 @@ public class TeamPDOMImportOperation implements IWorkspaceRunnable { ObjectInputStream input= new ObjectInputStream(zip.getInputStream(indexEntry)); try { Object obj= input.readObject(); - if (obj instanceof Map) { + if (obj instanceof Map) { return (Map) obj; } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java index 95f00119e63..bf52c685781 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java @@ -580,7 +580,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { private void overlayMarkers(Position position, ProblemAnnotation problemAnnotation) { Object value= getAnnotations(position); - if (value instanceof List) { + if (value instanceof List) { List list= (List) value; for (Object element : list) setOverlay(element, problemAnnotation); @@ -681,7 +681,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { Position position= getPosition(annotation); synchronized (getLockObject()) { Object cached= fReverseMap.get(position); - if (cached instanceof List) { + if (cached instanceof List) { List list= (List) cached; list.remove(annotation); if (list.size() == 1) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplatePreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplatePreferencePage.java index fd09d23150a..fcbbe051bd6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplatePreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplatePreferencePage.java @@ -159,7 +159,7 @@ public class CodeTemplatePreferencePage extends PropertyAndPreferencePage { */ @Override public void applyData(Object data) { - if (data instanceof Map) { + if (data instanceof Map) { Object id= ((Map) data).get(DATA_SELECT_TEMPLATE); if (id instanceof String) { final TemplatePersistenceData[] templates= fCodeTemplateConfigurationBlock.fTemplateStore.getTemplateData(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PropertyAndPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PropertyAndPreferencePage.java index 24b175bb0d5..66354046689 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PropertyAndPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PropertyAndPreferencePage.java @@ -332,7 +332,7 @@ public abstract class PropertyAndPreferencePage extends PreferencePage implement */ @Override public void applyData(Object data) { - if (data instanceof Map) { + if (data instanceof Map) { fData= (Map) data; } if (fChangeWorkspaceSettings != null) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/AbstractSpellDictionary.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/AbstractSpellDictionary.java index a6dd111e059..26c6eaa04da 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/AbstractSpellDictionary.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/AbstractSpellDictionary.java @@ -374,7 +374,7 @@ public abstract class AbstractSpellDictionary implements ISpellDictionary { if (bucket == null) { fHashBuckets.put(hash, word); - } else if (bucket instanceof ArrayList) { + } else if (bucket instanceof ArrayList) { @SuppressWarnings("unchecked") final ArrayList bucket2 = (ArrayList)bucket; bucket2.add(word); @@ -553,7 +553,7 @@ public abstract class AbstractSpellDictionary implements ISpellDictionary { Iterator iter= fHashBuckets.values().iterator(); while (iter.hasNext()) { Object element= iter.next(); - if (element instanceof ArrayList) + if (element instanceof ArrayList) ((ArrayList)element).trimToSize(); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ListContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ListContentProvider.java index 9469c8588fc..44deb1a1260 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ListContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ListContentProvider.java @@ -31,7 +31,7 @@ public class ListContentProvider implements IStructuredContentProvider { } public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - if (newInput instanceof List) + if (newInput instanceof List) fContents= (List)newInput; else fContents= null; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvironmentTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvironmentTab.java index ea8c5040f27..32251ad7471 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvironmentTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvironmentTab.java @@ -539,7 +539,7 @@ public class EnvironmentTab extends AbstractCPropertyTab { public Object[] getElements(Object inputElement) { String[] els = null; - if (inputElement instanceof Map) { + if (inputElement instanceof Map) { @SuppressWarnings("unchecked") Map m = (Map)inputElement; els = new String[m.size()];