From bad671df6cc83ce41b0fb7903043a86c517d4930 Mon Sep 17 00:00:00 2001 From: Markus Schorn Date: Thu, 22 Jan 2009 14:08:34 +0000 Subject: [PATCH] Fix warnings. --- .../core/settings/model/BackwardCompatibilityTests.java | 3 ++- .../settings/model/CProjectDescriptionBasicTests.java | 3 --- .../cdt/internal/core/model/DefaultPathEntryStore.java | 9 ++------- core/org.eclipse.cdt.core/plugin.properties | 4 +++- core/org.eclipse.cdt.core/plugin.xml | 4 ++-- .../src/org/eclipse/cdt/core/ErrorParserManager.java | 2 +- .../src/org/eclipse/cdt/core/ICDescriptorManager.java | 2 +- .../cdt/internal/core/CConfigBasedDescriptorManager.java | 5 ++--- .../cdt/internal/ui/text/doctools/ProjectMap.java | 4 ---- 9 files changed, 13 insertions(+), 23 deletions(-) diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/BackwardCompatibilityTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/BackwardCompatibilityTests.java index 0324310dd64..66b322fc96f 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/BackwardCompatibilityTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/BackwardCompatibilityTests.java @@ -30,7 +30,6 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; -import org.w3c.dom.Element; public class BackwardCompatibilityTests extends BaseTestCase { private static final String PROJ_NAME_PREFIX = "BackwardCompatibilityTests_"; @@ -40,9 +39,11 @@ public class BackwardCompatibilityTests extends BaseTestCase { return suite(BackwardCompatibilityTests.class, "_"); } + @Override protected void setUp() throws Exception { } + @Override protected void tearDown() throws Exception { try { if(p1 != null){ diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionBasicTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionBasicTests.java index 7a23ab39a12..db73e98882c 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionBasicTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionBasicTests.java @@ -10,11 +10,8 @@ *******************************************************************************/ package org.eclipse.cdt.core.settings.model; -import java.util.Map; - import junit.framework.TestSuite; -import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.CProjectNature; import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.CoreModel; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DefaultPathEntryStore.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DefaultPathEntryStore.java index ef0b1ab0325..bb8d618842c 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DefaultPathEntryStore.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DefaultPathEntryStore.java @@ -34,7 +34,6 @@ import org.eclipse.cdt.core.model.IPathEntry; import org.eclipse.cdt.core.resources.IPathEntryStore; import org.eclipse.cdt.core.resources.IPathEntryStoreListener; import org.eclipse.cdt.core.resources.PathEntryStoreChangedEvent; -import org.eclipse.cdt.core.settings.model.ICSettingEntry; import org.eclipse.cdt.core.settings.model.ICStorageElement; import org.eclipse.cdt.internal.core.CharOperation; import org.eclipse.core.resources.IProject; @@ -42,10 +41,6 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; /** * PathEntryStore @@ -143,10 +138,10 @@ public class DefaultPathEntryStore implements IPathEntryStore, ICDescriptorListe } // check fo the base path - IPath basePath = new Path(element.hasAttribute(ATTRIBUTE_BASE_PATH) ? element.getAttribute(ATTRIBUTE_BASE_PATH) : ""); + IPath basePath = new Path(element.hasAttribute(ATTRIBUTE_BASE_PATH) ? element.getAttribute(ATTRIBUTE_BASE_PATH) : ""); //$NON-NLS-1$ // get the base ref - IPath baseRef = new Path(element.hasAttribute(ATTRIBUTE_BASE_REF) ? element.getAttribute(ATTRIBUTE_BASE_REF) : ""); + IPath baseRef = new Path(element.hasAttribute(ATTRIBUTE_BASE_REF) ? element.getAttribute(ATTRIBUTE_BASE_REF) : ""); //$NON-NLS-1$ // exclusion patterns (optional) String exclusion = element.getAttribute(ATTRIBUTE_EXCLUDING); diff --git a/core/org.eclipse.cdt.core/plugin.properties b/core/org.eclipse.cdt.core/plugin.properties index 44c47922043..1da52bc91ef 100644 --- a/core/org.eclipse.cdt.core/plugin.properties +++ b/core/org.eclipse.cdt.core/plugin.properties @@ -96,4 +96,6 @@ defaultProvider.name = Default Provider templatesExtensionPoint.name = Templates Extension point templateProcessTypes.name = Process Types Extension point templateAssociations.name = Template Associations -CProjectDescriptionStorage.name = Project Description Storage Extension point \ No newline at end of file +CProjectDescriptionStorage.name = Project Description Storage Extension point +CProjectStorageType.singlefile.name = Xml Storage (single file) +CProjectStorageType.separatefile.name = Xml Storage (Separate Files) \ No newline at end of file diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml index 22242f432f5..cf188d294d6 100644 --- a/core/org.eclipse.cdt.core/plugin.xml +++ b/core/org.eclipse.cdt.core/plugin.xml @@ -621,14 +621,14 @@ class="org.eclipse.cdt.internal.core.settings.model.xml.XmlProjectDescriptionStorageFactory" id="XmlProjectDescriptionStorage" max_version="4.0.0" - name="Xml Storage (single file)" + name="%CProjectStorageType.singlefile.name" version="4.0.0"> 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 ae38d474801..da8e25ea272 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 @@ -230,7 +230,7 @@ public class ErrorParserManager extends OutputStream { return; } } catch (Exception e){ - String message = "Error parsing line [" + lineToParse + "]"; //$NON-NLS-2$ + String message = "Error parsing line [" + lineToParse + "]"; //$NON-NLS-1$//$NON-NLS-2$ CCorePlugin.log(message, e); } } diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ICDescriptorManager.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ICDescriptorManager.java index 3c171e0e29f..c2fc27776e5 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ICDescriptorManager.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ICDescriptorManager.java @@ -25,7 +25,7 @@ public interface ICDescriptorManager { /** * Return the ICDescriptor for the project. If project doesn't contain * an ICDescriptor then one is created. - * Equivalent to: {@link ICDescriptorManager#getDescriptor(IProject, true)} + * Equivalent to: {@code ICDescriptorManager#getDescriptor(project, true)} * * Users should consider batching changes in an ICDescriptorOperation * diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CConfigBasedDescriptorManager.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CConfigBasedDescriptorManager.java index e620cd45b22..ef48562876d 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CConfigBasedDescriptorManager.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CConfigBasedDescriptorManager.java @@ -14,7 +14,6 @@ package org.eclipse.cdt.internal.core; import java.lang.ref.Reference; import java.lang.ref.SoftReference; -import java.lang.ref.SoftReference; import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -77,7 +76,7 @@ import org.eclipse.core.runtime.Status; * but they are synchronized. This is safe as long as structural changes aren't made to the same * project storage element from multiple threads. * - * @see {ICDescriptor} for more + * @see ICDescriptor for more */ final public class CConfigBasedDescriptorManager implements ICDescriptorManager { private volatile static CConfigBasedDescriptorManager fInstance; @@ -387,7 +386,7 @@ final public class CConfigBasedDescriptorManager implements ICDescriptorManager */ private static CConfigBasedDescriptor loadDescriptor(CProjectDescription des) throws CoreException { if (des == null) - throw ExceptionFactory.createCoreException("CProjectDescription des is null"); + throw ExceptionFactory.createCoreException("CProjectDescription des is null"); //$NON-NLS-1$ if(des.isReadOnly()) des = (CProjectDescription)CProjectDescriptionManager.getInstance().getProjectDescription(des.getProject(), true); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/ProjectMap.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/ProjectMap.java index 2ecdd802e9a..1161afc87ce 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/ProjectMap.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/ProjectMap.java @@ -21,13 +21,9 @@ import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.ICDescriptor; -import org.eclipse.cdt.core.settings.model.ICSettingEntry; import org.eclipse.cdt.core.settings.model.ICStorageElement; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner;