From d94ffa186941cb80cca8a845074e4e56cb0cbaf6 Mon Sep 17 00:00:00 2001 From: Andrew Ferguson Date: Wed, 30 May 2007 14:41:47 +0000 Subject: [PATCH] fix warnings (imports, string externalization) --- .../org/eclipse/cdt/core/model/CoreModel.java | 2 -- .../cdt/core/model/ElementChangedEvent.java | 2 -- .../org/eclipse/cdt/core/model/ICProject.java | 1 - .../cdt/core/model/IContributedCElement.java | 1 - .../eclipse/cdt/core/model/LanguageManager.java | 1 - .../settings/model/ICConfigExtensionReference.java | 1 - .../settings/model/ICConfigurationDescription.java | 1 - .../core/settings/model/ICProjectDescription.java | 1 - .../cdt/core/settings/model/ICSettingsStorage.java | 1 - .../cdt/internal/core/model/CModelInfo.java | 1 - .../internal/core/model/SourceManipulation.java | 1 - .../core/model/SourceManipulationInfo.java | 3 --- .../core/settings/model/CLanguageSetting.java | 1 - .../model/SetCProjectDescriptionOperation.java | 1 - .../parser/org/eclipse/cdt/core/dom/IName.java | 1 - .../parser/GNUScannerExtensionConfiguration.java | 2 +- .../cdt/core/dom/parser/ISourceCodeParser.java | 1 - .../cdt/core/dom/parser/c/AbstractCLanguage.java | 1 - .../cpp/ICPPParserExtensionConfiguration.java | 1 - .../org/eclipse/cdt/core/index/IIndexManager.java | 1 - .../core/index/export/IExportProjectProvider.java | 3 --- .../internal/core/parser/QuickParseCallback.java | 3 ++- .../core/parser/StructuralParseCallback.java | 1 - .../cdt/internal/core/pdom/dom/PDOMBinding.java | 1 - .../src/org/eclipse/cdt/core/CCProjectNature.java | 1 - .../src/org/eclipse/cdt/core/CCorePlugin.java | 1 - .../src/org/eclipse/cdt/core/ToolFactory.java | 1 - .../IPathEntryVariableChangeListener.java | 2 -- .../core/templateengine/TemplateEngineHelper.java | 14 ++++++++------ .../process/processes/CreateSourceFolder.java | 2 +- 30 files changed, 12 insertions(+), 42 deletions(-) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java index 438256ffda1..f01ea1e236c 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java @@ -23,7 +23,6 @@ import org.eclipse.cdt.core.settings.model.ICProjectDescription; import org.eclipse.cdt.core.settings.model.ICProjectDescriptionListener; import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager; import org.eclipse.cdt.core.settings.model.ICSettingEntry; -import org.eclipse.cdt.core.settings.model.WriteAccessException; import org.eclipse.cdt.internal.core.model.APathEntry; import org.eclipse.cdt.internal.core.model.BatchOperation; import org.eclipse.cdt.internal.core.model.CModel; @@ -51,7 +50,6 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.Plugin; import org.eclipse.core.runtime.content.IContentType; import org.eclipse.core.runtime.jobs.ISchedulingRule; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ElementChangedEvent.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ElementChangedEvent.java index 6a30eed7976..47396337385 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ElementChangedEvent.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ElementChangedEvent.java @@ -12,8 +12,6 @@ package org.eclipse.cdt.core.model; *******************************************************************************/ import java.util.EventObject; -import org.eclipse.cdt.internal.core.model.CShiftData; - /** * An element changed event describes a change to the structure or contents * of a tree of C elements. The changes to the elements are described by diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ICProject.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ICProject.java index 018c4c23129..08d84afd5b4 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ICProject.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ICProject.java @@ -13,7 +13,6 @@ package org.eclipse.cdt.core.model; import java.util.Map; -import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IPath; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/IContributedCElement.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/IContributedCElement.java index a67e12fd20b..42ee1738e98 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/IContributedCElement.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/IContributedCElement.java @@ -10,7 +10,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.model; -import org.eclipse.core.runtime.IAdaptable; /** * Additions to the ICElement hierarchy provided by diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/LanguageManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/LanguageManager.java index fabca6d53bb..5a9f140b9a7 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/LanguageManager.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/LanguageManager.java @@ -24,7 +24,6 @@ import java.util.Map; import java.util.Set; import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.dom.ILinkage; import org.eclipse.cdt.core.language.ProjectLanguageConfiguration; import org.eclipse.cdt.core.language.WorkspaceLanguageConfiguration; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICConfigExtensionReference.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICConfigExtensionReference.java index 22aa30c272c..7bfa9d92b9a 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICConfigExtensionReference.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICConfigExtensionReference.java @@ -11,7 +11,6 @@ package org.eclipse.cdt.core.settings.model; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IConfigurationElement; public interface ICConfigExtensionReference { /** diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICConfigurationDescription.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICConfigurationDescription.java index b854c55b768..2e0fa641c53 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICConfigurationDescription.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICConfigurationDescription.java @@ -14,7 +14,6 @@ import java.util.Map; import org.eclipse.cdt.core.cdtvariables.ICdtVariablesContributor; import org.eclipse.cdt.core.settings.model.extension.CConfigurationData; -import org.eclipse.cdt.core.settings.model.extension.CConfigurationDataProvider; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.QualifiedName; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICProjectDescription.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICProjectDescription.java index 3afeb365364..d188552a950 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICProjectDescription.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICProjectDescription.java @@ -10,7 +10,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.settings.model; -import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.settings.model.extension.CConfigurationData; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICSettingsStorage.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICSettingsStorage.java index 8a72863f39e..5c752e1460c 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICSettingsStorage.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICSettingsStorage.java @@ -10,7 +10,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.settings.model; -import org.eclipse.cdt.core.settings.model.extension.CConfigurationDataProvider; import org.eclipse.core.runtime.CoreException; /** 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 31e51791889..77b6e3dafe7 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 @@ -12,7 +12,6 @@ package org.eclipse.cdt.internal.core.model; import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICModel; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceManipulation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceManipulation.java index bf7839416db..aa00884d5bc 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceManipulation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceManipulation.java @@ -15,7 +15,6 @@ import java.util.Map; import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.IMember; import org.eclipse.cdt.core.model.IOpenable; import org.eclipse.cdt.core.model.ISourceManipulation; import org.eclipse.cdt.core.model.ISourceRange; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceManipulationInfo.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceManipulationInfo.java index d9b3ddfe125..626e38bf606 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceManipulationInfo.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceManipulationInfo.java @@ -14,10 +14,7 @@ package org.eclipse.cdt.internal.core.model; import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.IBuffer; import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.IMember; -import org.eclipse.cdt.core.model.ISourceManipulation; import org.eclipse.cdt.core.model.ISourceRange; -import org.eclipse.cdt.core.model.ISourceReference; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.core.runtime.IProgressMonitor; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CLanguageSetting.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CLanguageSetting.java index 7c6e84a8b44..d343de46e81 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CLanguageSetting.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CLanguageSetting.java @@ -22,7 +22,6 @@ import org.eclipse.cdt.core.settings.model.extension.impl.CDefaultLanguageData; import org.eclipse.cdt.core.settings.model.util.CDataUtil; import org.eclipse.cdt.core.settings.model.util.EntryStore; import org.eclipse.cdt.core.settings.model.util.KindBasedStore; -import org.eclipse.core.resources.IProject; public class CLanguageSetting extends CDataProxy implements ICLanguageSetting { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SetCProjectDescriptionOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SetCProjectDescriptionOperation.java index 02b83ed7ca0..747273c9459 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SetCProjectDescriptionOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SetCProjectDescriptionOperation.java @@ -18,7 +18,6 @@ import org.eclipse.cdt.core.settings.model.CProjectDescriptionEvent; import org.eclipse.cdt.core.settings.model.ICDescriptionDelta; import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager; import org.eclipse.cdt.internal.core.model.CModelOperation; -import org.eclipse.cdt.internal.core.model.CModelStatus; import org.eclipse.cdt.internal.core.settings.model.CProjectDescriptionManager.CompositeWorkspaceRunnable; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/IName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/IName.java index 60de3bccb78..18cd333cf68 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/IName.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/IName.java @@ -12,7 +12,6 @@ package org.eclipse.cdt.core.dom; import org.eclipse.cdt.core.dom.ast.IASTFileLocation; -import org.eclipse.cdt.core.dom.ast.IASTNode; /** * Common interface for names in the index and the AST. diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/GNUScannerExtensionConfiguration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/GNUScannerExtensionConfiguration.java index ee4e3300d45..02e0235115a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/GNUScannerExtensionConfiguration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/GNUScannerExtensionConfiguration.java @@ -90,7 +90,7 @@ public abstract class GNUScannerExtensionConfiguration extends AbstractScannerEx // Kludge for MSVC support until we get a real extension private static final ObjectStyleMacro __stdcall = new ObjectStyleMacro( - "__stdcall".toCharArray(), emptyCharArray); + "__stdcall".toCharArray(), emptyCharArray); //$NON-NLS-1$ /** * @return diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/ISourceCodeParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/ISourceCodeParser.java index 906b73c8a88..01ba113dd8c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/ISourceCodeParser.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/ISourceCodeParser.java @@ -12,7 +12,6 @@ package org.eclipse.cdt.core.dom.parser; import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.parser.ParseError; /** * Interface for an AST source code parser. diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/c/AbstractCLanguage.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/c/AbstractCLanguage.java index ea0fad32f6f..fe1efe38fae 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/c/AbstractCLanguage.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/c/AbstractCLanguage.java @@ -23,7 +23,6 @@ import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.ast.c.CASTVisitor; -import org.eclipse.cdt.core.dom.parser.AbstractScannerExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.IScannerExtensionConfiguration; import org.eclipse.cdt.core.dom.parser.ISourceCodeParser; import org.eclipse.cdt.core.index.IIndex; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/ICPPParserExtensionConfiguration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/ICPPParserExtensionConfiguration.java index 39b9cd56705..1b00476cd67 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/ICPPParserExtensionConfiguration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/ICPPParserExtensionConfiguration.java @@ -12,7 +12,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.dom.parser.cpp; -import org.eclipse.cdt.core.dom.ast.IScope; import org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider; /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/IIndexManager.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/IIndexManager.java index d3e76f59bad..3e2531e8d3e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/IIndexManager.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/IIndexManager.java @@ -11,7 +11,6 @@ package org.eclipse.cdt.core.index; -import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/IExportProjectProvider.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/IExportProjectProvider.java index 6d92f51aa48..8836e0fcd46 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/IExportProjectProvider.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/IExportProjectProvider.java @@ -13,11 +13,8 @@ package org.eclipse.cdt.core.index.export; import java.util.Map; import org.eclipse.cdt.core.index.IIndexLocationConverter; -import org.eclipse.cdt.core.index.ResourceContainerRelativeLocationConverter; -import org.eclipse.cdt.core.index.URIRelativeLocationConverter; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.Platform; /** * An IExportProjectProvider provides a configured ICProject suitable set up for diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/QuickParseCallback.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/QuickParseCallback.java index 2d9c4b0a0fc..b16e57b5366 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/QuickParseCallback.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/QuickParseCallback.java @@ -15,8 +15,9 @@ import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; -import org.eclipse.cdt.core.parser.*; +import org.eclipse.cdt.core.parser.IProblem; import org.eclipse.cdt.core.parser.IQuickParseCallback; +import org.eclipse.cdt.core.parser.NullSourceElementRequestor; import org.eclipse.cdt.core.parser.ast.ASTNotImplementedException; import org.eclipse.cdt.core.parser.ast.IASTCompilationUnit; import org.eclipse.cdt.core.parser.ast.IASTFunction; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/StructuralParseCallback.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/StructuralParseCallback.java index 18ba9fadce8..d9e52a1b029 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/StructuralParseCallback.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/StructuralParseCallback.java @@ -30,7 +30,6 @@ import org.eclipse.cdt.core.parser.ast.IASTTemplateDeclaration; import org.eclipse.cdt.core.parser.ast.IASTTypedefDeclaration; import org.eclipse.cdt.core.parser.ast.IASTUsingDirective; import org.eclipse.cdt.core.parser.ast.IASTVariable; -import org.eclipse.cdt.internal.core.parser.QuickParseCallback; import org.eclipse.cdt.internal.core.parser.ast.complete.ASTLinkageSpecification; import org.eclipse.cdt.internal.core.parser.ast.complete.ASTScope; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMBinding.java index ebe74fdc89c..488e94603b9 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMBinding.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMBinding.java @@ -22,7 +22,6 @@ import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.IScope; import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateInstance; import org.eclipse.cdt.core.index.IIndexBinding; -import org.eclipse.cdt.internal.core.index.IIndexFragmentBindingComparator; import org.eclipse.cdt.internal.core.index.IIndexFragment; import org.eclipse.cdt.internal.core.index.IIndexFragmentBinding; import org.eclipse.cdt.internal.core.pdom.PDOM; diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCProjectNature.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCProjectNature.java index dbd9609366a..0e23aff49aa 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCProjectNature.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCProjectNature.java @@ -11,7 +11,6 @@ package org.eclipse.cdt.core; import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IProjectNature; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; 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 f8d91c089a9..3f3a8662365 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 @@ -39,7 +39,6 @@ import org.eclipse.cdt.core.resources.IPathEntryVariableManager; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.cdt.core.settings.model.ICProjectDescription; import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager; -import org.eclipse.cdt.core.settings.model.WriteAccessException; import org.eclipse.cdt.core.settings.model.util.CDataUtil; import org.eclipse.cdt.internal.core.CContentTypes; import org.eclipse.cdt.internal.core.CDTLogWriter; diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ToolFactory.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ToolFactory.java index 73522ec3083..3641553158b 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ToolFactory.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ToolFactory.java @@ -15,7 +15,6 @@ package org.eclipse.cdt.core; import java.util.Map; import org.eclipse.cdt.core.formatter.CodeFormatter; -import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; import org.eclipse.cdt.internal.formatter.CCodeFormatter; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/IPathEntryVariableChangeListener.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/IPathEntryVariableChangeListener.java index fa5878e80f7..267e4ef3a37 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/IPathEntryVariableChangeListener.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/IPathEntryVariableChangeListener.java @@ -14,8 +14,6 @@ package org.eclipse.cdt.core.resources; import java.util.EventListener; -import org.eclipse.core.resources.IPathVariableChangeListener; - /** * An interface to be implemented by objects interested in path variable diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateEngineHelper.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateEngineHelper.java index 26d45b44a42..79904a2f523 100644 --- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateEngineHelper.java +++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateEngineHelper.java @@ -34,7 +34,7 @@ import org.osgi.framework.Bundle; * @since 4.0 */ public class TemplateEngineHelper { - + public static final String US = "_"; //$NON-NLS-1$ public static final String OPEN_MARKER = "$("; //$NON-NLS-1$ public static final String CLOSE_MARKER = ")"; //$NON-NLS-1$ public static final String STRING_EXTERNALIZATION_MARKER = "%"; //$NON-NLS-1$ @@ -42,6 +42,8 @@ public class TemplateEngineHelper { // This is used while getting the Plugin Path. public static final String PROJRESOURCE = "plugin.xml"; //$NON-NLS-1$ public static final String PLUGIN_ID = "pluginId"; //$NON-NLS-1$ + public static final String PLUGIN_PROPERTIES = "plugin.properties"; //$NON-NLS-1$ + public static final String TEMPLATE_PROPERTIES = "templates.properties"; //$NON-NLS-1$ public static final String BOOLTRUE = "true"; //$NON-NLS-1$ public static final String ID = "id"; //$NON-NLS-1$ public static final String VALUE = "value"; //$NON-NLS-1$ @@ -230,7 +232,7 @@ public class TemplateEngineHelper { String pluginId = ti.getPluginId(); String path = ti.getTemplatePath(); IPath p = new Path(path); - String propertiesPath = "template.properties"; + String propertiesPath = TEMPLATE_PROPERTIES; if(p.segmentCount() != 0){ p = p.removeLastSegments(1); propertiesPath = p.append(propertiesPath).toString(); @@ -246,7 +248,7 @@ public class TemplateEngineHelper { try { value = location != null ? getValueFromProperties(pluginId, location, key.substring(1)) : null; if (value == null) { - value = getValueFromProperties(pluginId, "plugin.properties", key.substring(1)); + value = getValueFromProperties(pluginId, PLUGIN_PROPERTIES, key.substring(1)); } } catch (IOException e) { value = key; @@ -288,13 +290,13 @@ public class TemplateEngineHelper { String country = locale.getCountry(); String variant = locale.getVariant(); - url = bundle.getResource(propertiesFile + "_" + lang + "_" + country + "_" + variant); + url = bundle.getResource(propertiesFile + US + lang + US + country + US + variant); if (url == null) { - url = bundle.getResource(propertiesFile + "_" + lang + "_" + country); + url = bundle.getResource(propertiesFile + US + lang + US + country); } if (url == null) { - url = bundle.getResource(propertiesFile + "_" + lang); + url = bundle.getResource(propertiesFile + US + lang); } if (url == null) { url = bundle.getResource(propertiesFile); diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/processes/CreateSourceFolder.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/processes/CreateSourceFolder.java index f1fecc5824c..102646ceed2 100644 --- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/processes/CreateSourceFolder.java +++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/processes/CreateSourceFolder.java @@ -50,7 +50,7 @@ public class CreateSourceFolder extends ProcessRunner { protected void createSourceFolder(String projectName, String targetPath, IProgressMonitor monitor) throws ProcessFailureException { //If the targetPath is an empty string, there will be no source folder to create. // Also this is not an error. So just return gracefully. - if (targetPath == null || targetPath.equals("")) { + if (targetPath == null || targetPath.length()==0) { return; }