From 05195a0a7d06787d82f9a91f86482f1f10b9add8 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Mon, 22 Mar 2004 21:32:51 +0000 Subject: [PATCH] Boost the warning of the compiler and fix the unnecessary casting --- core/org.eclipse.cdt.core/ChangeLog | 7 +++++++ .../org/eclipse/cdt/internal/core/model/CElement.java | 2 +- .../org/eclipse/cdt/internal/core/model/CElementDelta.java | 2 +- .../org/eclipse/cdt/internal/core/model/CModelStatus.java | 2 +- .../internal/core/model/CommitWorkingCopyOperation.java | 4 ++-- .../internal/core/model/CreateElementInTUOperation.java | 2 +- .../eclipse/cdt/internal/core/model/TranslationUnit.java | 2 +- .../org/eclipse/cdt/internal/core/model/WorkingCopy.java | 4 ++-- .../src/org/eclipse/cdt/core/ErrorParserManager.java | 2 +- .../src/org/eclipse/cdt/internal/core/ProcessClosure.java | 2 +- .../utils/org/eclipse/cdt/utils/Symbol.java | 2 +- .../utils/org/eclipse/cdt/utils/coff/PE.java | 2 +- .../utils/org/eclipse/cdt/utils/debug/tools/DebugSym.java | 2 +- 13 files changed, 21 insertions(+), 14 deletions(-) diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog index 7e4e615c332..ca328ca634f 100644 --- a/core/org.eclipse.cdt.core/ChangeLog +++ b/core/org.eclipse.cdt.core/ChangeLog @@ -1,3 +1,10 @@ +2004-03-22 Alain Magloire + + Boost the warning of the compiler and remove + Unneeded castings. + + * to many to enumerates. + 2004-03-22 Alain Magloire * model/org/eclipse/cdt/core/model/CoreModel.java diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElement.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElement.java index 594d4d76c55..40409dbbd56 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElement.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElement.java @@ -352,7 +352,7 @@ public abstract class CElement extends PlatformObject implements ICElement { } else { Openable openableParent = (Openable)getOpenableParent(); if (openableParent != null) { - CElementInfo openableParentInfo = (CElementInfo) CModelManager.getDefault().getInfo((ICElement) openableParent); + CElementInfo openableParentInfo = (CElementInfo) CModelManager.getDefault().getInfo(openableParent); if (openableParentInfo == null) { openableParent.openWhenClosed(null); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElementDelta.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElementDelta.java index 6156da06acb..ac88d6708d3 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElementDelta.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElementDelta.java @@ -398,7 +398,7 @@ public class CElementDelta implements ICElementDelta { if (equalsAndSameParent(delta.getElement(), element)) { // handle case of two jars that can be equals but not in the same project return delta; } else { - delta = ((CElementDelta)delta).getDeltaFor(element); + delta = delta.getDeltaFor(element); if (delta != null) return delta; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelStatus.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelStatus.java index 260d04c5220..e6939dd3e38 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelStatus.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelStatus.java @@ -44,7 +44,7 @@ public class CModelStatus extends Status implements ICModelStatus, ICModelStatus /** * Singleton OK object */ - public static final ICModelStatus VERIFIED_OK = new CModelStatus(OK, OK, org.eclipse.cdt.internal.core.Util.bind("status.OK"));; //$NON-NLS-1$ + public static final ICModelStatus VERIFIED_OK = new CModelStatus(OK, OK, org.eclipse.cdt.internal.core.Util.bind("status.OK")); //$NON-NLS-1$ /** * Constructs an C model status with no corresponding elements. diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CommitWorkingCopyOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CommitWorkingCopyOperation.java index 062ae92d507..4be0ce47a03 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CommitWorkingCopyOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CommitWorkingCopyOperation.java @@ -62,7 +62,7 @@ public class CommitWorkingCopyOperation extends CModelOperation { try { beginTask("workingCopy.commit", 2); //$NON-NLS-1$ WorkingCopy copy = (WorkingCopy)getElementToProcess(); - ITranslationUnit original = (ITranslationUnit) copy.getOriginalElement(); + ITranslationUnit original = copy.getOriginalElement(); // creates the delta builder (this remembers the content of the cu) @@ -127,7 +127,7 @@ public class CommitWorkingCopyOperation extends CModelOperation { return new CModelStatus(ICModelStatusConstants.INVALID_ELEMENT_TYPES, wc); } - ITranslationUnit original= (ITranslationUnit)wc.getOriginalElement(); + ITranslationUnit original= wc.getOriginalElement(); IResource resource = original.getResource(); if (!wc.isBasedOn(resource) && !fForce) { return new CModelStatus(ICModelStatusConstants.UPDATE_CONFLICT); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateElementInTUOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateElementInTUOperation.java index e70af712749..94a6e581a91 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateElementInTUOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateElementInTUOperation.java @@ -62,7 +62,7 @@ public abstract class CreateElementInTUOperation extends CModelOperation { /** * The element that is being created. */ - protected ISourceReference fCreatedElement = null;; + protected ISourceReference fCreatedElement = null; /** * The element that the newly created element is diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/TranslationUnit.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/TranslationUnit.java index 73c6dfd25e3..660496b5bce 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/TranslationUnit.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/TranslationUnit.java @@ -320,7 +320,7 @@ public class TranslationUnit extends Openable implements ITranslationUnit { /////////////////////////////////////////////////////////////// if (isWorkingCopy()) { - ITranslationUnit original = (ITranslationUnit) ((IWorkingCopy)this).getOriginalElement(); + ITranslationUnit original = ((IWorkingCopy)this).getOriginalElement(); // might be IResource.NULL_STAMP if original does not exist IResource r = original.getResource(); if (r != null && r instanceof IFile) { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/WorkingCopy.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/WorkingCopy.java index 3eac0f97f16..3e33f348bbd 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/WorkingCopy.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/WorkingCopy.java @@ -70,7 +70,7 @@ public class WorkingCopy extends TranslationUnit implements IWorkingCopy { */ public void commit(boolean force, IProgressMonitor monitor) throws CModelException { - ITranslationUnit original = (ITranslationUnit)this.getOriginalElement(); + ITranslationUnit original = this.getOriginalElement(); if (original.exists()) { CommitWorkingCopyOperation op= new CommitWorkingCopyOperation(this, force); runOperation(op, monitor); @@ -248,7 +248,7 @@ public class WorkingCopy extends TranslationUnit implements IWorkingCopy { // set the buffer source if needed if (buffer.getCharacters() == null){ - ITranslationUnit original= (ITranslationUnit)this.getOriginalElement(); + ITranslationUnit original= this.getOriginalElement(); IBuffer originalBuffer = null; try { originalBuffer = original.getBuffer(); diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ErrorParserManager.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ErrorParserManager.java index 2fcfc1b5ae7..3ecb10c6c0c 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ErrorParserManager.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ErrorParserManager.java @@ -253,7 +253,7 @@ public class ErrorParserManager extends OutputStream { path = fp; } } else { - path = (IPath) getWorkingDirectory().append(filePath); + path = getWorkingDirectory().append(filePath); } IFile file = null; diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/ProcessClosure.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/ProcessClosure.java index c385eaad09f..21f4396322c 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/ProcessClosure.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/ProcessClosure.java @@ -38,7 +38,7 @@ public class ProcessClosure { fOutputStream= out; fInputStream= in; setDaemon(true); - lineSeparator = (String) System.getProperty("line.separator"); //$NON-NLS-1$ + lineSeparator = System.getProperty("line.separator"); //$NON-NLS-1$ } public void run() { diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Symbol.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Symbol.java index 0042914df9f..3a4e58e999d 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Symbol.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Symbol.java @@ -106,7 +106,7 @@ public class Symbol implements ISymbol, Comparable { } else if (obj instanceof Long) { Long val = (Long) obj; anotherVal = val.longValue(); - thisVal = (long) this.addr; + thisVal = this.addr; } return (thisVal < anotherVal ? -1 : (thisVal == anotherVal ? 0 : 1)); } diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/PE.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/PE.java index 9683e752211..fcdb9fbb71d 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/PE.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/PE.java @@ -232,7 +232,7 @@ public class PE { buffer.append("StackCommit = ").append(SizeOfStackCommit).append(NL); //$NON-NLS-1$ buffer.append("HeapReserve = ").append(SizeOfHeapReserve).append(NL); //$NON-NLS-1$ buffer.append("HeapCommit = ").append(SizeOfHeapCommit).append(NL); //$NON-NLS-1$ - buffer.append("LoaderFlags = ").append(LoaderFlags).append(NL);; //$NON-NLS-1$ + buffer.append("LoaderFlags = ").append(LoaderFlags).append(NL); //$NON-NLS-1$ buffer.append("#Rva size = ").append(NumberOfRvaAndSizes).append(NL); //$NON-NLS-1$ return buffer.toString(); } diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugSym.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugSym.java index 18d9380dbd3..07d287772a9 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugSym.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugSym.java @@ -35,7 +35,7 @@ public class DebugSym implements Comparable { } else if (obj instanceof Long) { Long val = (Long) obj; anotherVal = val.longValue(); - thisVal = (long) this.addr; + thisVal = this.addr; } return (thisVal < anotherVal ? -1 : (thisVal == anotherVal ? 0 : 1)); }