From 59a22fcbb8fc1d818e987797d85b4894139e70ed Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Sun, 2 May 2004 03:03:43 +0000 Subject: [PATCH] Removing of annoying warnings about never used local variables. --- .../org/eclipse/cdt/internal/core/model/CContainerInfo.java | 1 - .../model/org/eclipse/cdt/internal/core/model/CModel.java | 2 -- .../org/eclipse/cdt/internal/core/model/CModelInfo.java | 1 - .../org/eclipse/cdt/internal/core/model/CModelManager.java | 4 ++-- .../org/eclipse/cdt/internal/core/model/CProjectInfo.java | 1 - .../org/eclipse/cdt/internal/core/model/PathEntryStore.java | 1 - .../src/org/eclipse/cdt/core/CConventions.java | 6 +----- .../src/org/eclipse/cdt/core/CCorePlugin.java | 4 ++-- .../src/org/eclipse/cdt/core/resources/ScannerProvider.java | 4 ---- 9 files changed, 5 insertions(+), 19 deletions(-) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CContainerInfo.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CContainerInfo.java index 490cc7e84ec..e664c6f53bf 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CContainerInfo.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CContainerInfo.java @@ -67,7 +67,6 @@ public class CContainerInfo extends OpenableInfo { IPathEntry[] entries = cproject.getResolvedPathEntries(); if (resources != null) { - ICElement[] children = getChildren(); for (int i = 0; i < resources.length; i++) { IResource member = resources[i]; switch(member.getType()) { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModel.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModel.java index e2a6409a4e0..2b920e7f9c6 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModel.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModel.java @@ -201,8 +201,6 @@ public class CModel extends Openable implements ICModel { } protected boolean computeChildren(OpenableInfo info, IResource res) throws CModelException { - CModelManager factory = CModelManager.getDefault(); - // determine my children IWorkspaceRoot root = (IWorkspaceRoot)getResource(); IProject[] projects = root.getProjects(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelInfo.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelInfo.java index e6b3334f271..2476a0ba3ab 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelInfo.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelInfo.java @@ -27,7 +27,6 @@ public class CModelInfo extends OpenableInfo { * Compute the non-C resources contained in this C project. */ private Object[] computeNonCResources() { - CModelManager mgr = CModelManager.getDefault(); IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); int length = projects.length; Object[] nonCProjects = null; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java index 33957cbd4a8..0f94f123acf 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java @@ -406,9 +406,9 @@ public class CModelManager implements IResourceChangeListener, ICDescriptorListe IIncludeReference[] includeReferences = cproject.getIncludeReferences(); for (int i = 0; i < includeReferences.length; i++) { IPath includePath = includeReferences[i].getPath().append(path); - File file = path.toFile(); + File file = includePath.toFile(); if (file != null && file.isFile()) { - return new ExternalTranslationUnit(includeReferences[i], path); + return new ExternalTranslationUnit(includeReferences[i], includePath); } } } catch (CModelException e) { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProjectInfo.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProjectInfo.java index 0044529a725..ed68b815280 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProjectInfo.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProjectInfo.java @@ -70,7 +70,6 @@ class CProjectInfo extends OpenableInfo { return nonCResources; // determine if src == project - ISourceRoot root = null; boolean srcIsProject = false; IPathEntry[] entries = null; ICProject cproject = getElement().getCProject(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryStore.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryStore.java index f29c1d33781..6426324462a 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryStore.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryStore.java @@ -345,7 +345,6 @@ public class PathEntryStore extends AbstractCExtension implements IPathEntryStor if (event.getType() == CDescriptorEvent.CDTPROJECT_CHANGED) { ICDescriptor cdesc = event.getDescriptor(); if (cdesc != null) { - CModelManager manager = CModelManager.getDefault(); IProject project = cdesc.getProject(); // Call the listeners. fireContentChangedEvent(project); diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CConventions.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CConventions.java index 6ea4a6ad14a..2917435de91 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CConventions.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CConventions.java @@ -22,9 +22,6 @@ import org.eclipse.cdt.core.parser.ScannerInfo; import org.eclipse.cdt.internal.core.CharOperation; import org.eclipse.cdt.internal.core.Util; import org.eclipse.cdt.internal.core.model.CModelStatus; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IWorkspace; -import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; /** @@ -37,7 +34,7 @@ import org.eclipse.core.runtime.Status; public class CConventions { private final static String scopeResolutionOperator= "::"; //$NON-NLS-1$ private final static char fgDot= '.'; - private final static char fgColon= ':'; + //private final static char fgColon= ':'; private static boolean isLegalIdentifier(String name) { if (name == null) { @@ -146,7 +143,6 @@ public class CConventions { return new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, -1, Util.bind("convention.scope.nameWithBlanks"), null); //$NON-NLS-1$ } - IWorkspace workspace = ResourcesPlugin.getWorkspace(); StringTokenizer st = new StringTokenizer(name, scopeResolutionOperator); boolean firstToken = true; while (st.hasMoreTokens()) { diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java index 22b65932eaf..2f79b986d5c 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java @@ -634,7 +634,6 @@ public class CCorePlugin extends Plugin { ICDescriptor cdesc = getCProjectDescription(project); ICExtensionReference[] cextensions = cdesc.get(PATHENTRY_STORE_UNIQ_ID, true); if (cextensions.length > 0) { - ArrayList list = new ArrayList(cextensions.length); for (int i = 0; i < cextensions.length; i++) { try { store = (IPathEntryStore) cextensions[i].createExtension(); @@ -929,7 +928,8 @@ public class CCorePlugin extends Plugin { private static final String PARSER = CCorePlugin.PLUGIN_ID + "/debug/parser" ; //$NON-NLS-1$ private static final String SCANNER = CCorePlugin.PLUGIN_ID + "/debug/scanner"; //$NON-NLS-1$ private static final String DELTA = CCorePlugin.PLUGIN_ID + "/debug/deltaprocessor" ; //$NON-NLS-1$ - private static final String CONTENTASSIST = CCorePlugin.PLUGIN_ID + "/debug/contentassist" ; //$NON-NLS-1$ + //private static final String CONTENTASSIST = CCorePlugin.PLUGIN_ID + "/debug/contentassist" ; //$NON-NLS-1$ + /** * Configure the plugin with respect to option settings defined in ".options" file */ diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/ScannerProvider.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/ScannerProvider.java index b73cc839a41..51506052e57 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/ScannerProvider.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/ScannerProvider.java @@ -13,7 +13,6 @@ package org.eclipse.cdt.core.resources; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.ListIterator; import java.util.Map; import org.eclipse.cdt.core.AbstractCExtension; @@ -61,7 +60,6 @@ public class ScannerProvider extends AbstractCExtension implements IScannerInfoP if (listeners == null) { return; } - ListIterator iter = listeners.listIterator(); IScannerInfoChangeListener[] observers = new IScannerInfoChangeListener[listeners.size()]; listeners.toArray(observers); for (int i = 0; i < observers.length; i++) { @@ -210,8 +208,6 @@ public class ScannerProvider extends AbstractCExtension implements IScannerInfoP * Processes a delta recursively. */ protected void processDelta(ICElementDelta delta) throws CModelException { - int kind= delta.getKind(); - int flags= delta.getFlags(); ICElement element= delta.getElement(); if (isPathEntryChange(delta)) {