mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

Fix warnings.

Browse source
This commit is contained in:
Markus Schorn 2009-01-22 14:08:34 +00:00
parent 0dfdf444dd
commit bad671df6c
9 changed files with 13 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/BackwardCompatibilityTests.java
View file

@ -30,7 +30,6 @@ import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Path;
import org.w3c.dom.Element;
public class BackwardCompatibilityTests extends BaseTestCase { public class BackwardCompatibilityTests extends BaseTestCase {
private static final String PROJ_NAME_PREFIX = "BackwardCompatibilityTests_"; private static final String PROJ_NAME_PREFIX = "BackwardCompatibilityTests_";
@ -40,9 +39,11 @@ public class BackwardCompatibilityTests extends BaseTestCase {
return suite(BackwardCompatibilityTests.class, "_"); return suite(BackwardCompatibilityTests.class, "_");
} }
@Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
} }
@Override
protected void tearDown() throws Exception { protected void tearDown() throws Exception {
try { try {
if(p1 != null){ if(p1 != null){

3
core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionBasicTests.java
View file

@ -10,11 +10,8 @@
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.core.settings.model; package org.eclipse.cdt.core.settings.model;
import java.util.Map;
import junit.framework.TestSuite; import junit.framework.TestSuite;
import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.CProjectNature; import org.eclipse.cdt.core.CProjectNature;
import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.dom.IPDOMManager;
import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.CoreModel;

9
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DefaultPathEntryStore.java
View file

@ -34,7 +34,6 @@ import org.eclipse.cdt.core.model.IPathEntry;
import org.eclipse.cdt.core.resources.IPathEntryStore; import org.eclipse.cdt.core.resources.IPathEntryStore;
import org.eclipse.cdt.core.resources.IPathEntryStoreListener; import org.eclipse.cdt.core.resources.IPathEntryStoreListener;
import org.eclipse.cdt.core.resources.PathEntryStoreChangedEvent; 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.core.settings.model.ICStorageElement;
import org.eclipse.cdt.internal.core.CharOperation; import org.eclipse.cdt.internal.core.CharOperation;
import org.eclipse.core.resources.IProject; 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.IPath;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path; 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 * PathEntryStore
@ -143,10 +138,10 @@ public class DefaultPathEntryStore implements IPathEntryStore, ICDescriptorListe
} }
// check fo the base path // 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 // 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) // exclusion patterns (optional)
String exclusion = element.getAttribute(ATTRIBUTE_EXCLUDING); String exclusion = element.getAttribute(ATTRIBUTE_EXCLUDING);

2
core/org.eclipse.cdt.core/plugin.properties
View file

@ -97,3 +97,5 @@ templatesExtensionPoint.name = Templates Extension point
templateProcessTypes.name = Process Types Extension point templateProcessTypes.name = Process Types Extension point
templateAssociations.name = Template Associations templateAssociations.name = Template Associations
CProjectDescriptionStorage.name = Project Description Storage Extension point CProjectDescriptionStorage.name = Project Description Storage Extension point
CProjectStorageType.singlefile.name = Xml Storage (single file)
CProjectStorageType.separatefile.name = Xml Storage (Separate Files)

4
core/org.eclipse.cdt.core/plugin.xml
View file

@ -621,14 +621,14 @@
class="org.eclipse.cdt.internal.core.settings.model.xml.XmlProjectDescriptionStorageFactory" class="org.eclipse.cdt.internal.core.settings.model.xml.XmlProjectDescriptionStorageFactory"
id="XmlProjectDescriptionStorage" id="XmlProjectDescriptionStorage"
max_version="4.0.0" max_version="4.0.0"
name="Xml Storage (single file)" name="%CProjectStorageType.singlefile.name"
version="4.0.0"> version="4.0.0">
</CProjectStorageType> </CProjectStorageType>
<CProjectStorageType <CProjectStorageType
class="org.eclipse.cdt.internal.core.settings.model.xml2.XmlProjectDescriptionStorage2Factory" class="org.eclipse.cdt.internal.core.settings.model.xml2.XmlProjectDescriptionStorage2Factory"
id="XmlProjectDescriptionStorage2" id="XmlProjectDescriptionStorage2"
max_version="5.0.0" max_version="5.0.0"
name="Xml Storage (Separate Files)" name="%CProjectStorageType.separatefile.name"
version="5.0.0"> version="5.0.0">
</CProjectStorageType> </CProjectStorageType>
</extension> </extension>

2
core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ErrorParserManager.java
View file

@ -230,7 +230,7 @@ public class ErrorParserManager extends OutputStream {
return; return;
} }
} catch (Exception e){ } 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); CCorePlugin.log(message, e);
} }
} }

2
core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ICDescriptorManager.java
View file

@ -25,7 +25,7 @@ public interface ICDescriptorManager {
/** /**
* Return the ICDescriptor for the project. If project doesn't contain * Return the ICDescriptor for the project. If project doesn't contain
* an ICDescriptor then one is created. * 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 * Users should consider batching changes in an ICDescriptorOperation
* *

5
core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CConfigBasedDescriptorManager.java
View file

@ -14,7 +14,6 @@ package org.eclipse.cdt.internal.core;
import java.lang.ref.Reference; import java.lang.ref.Reference;
import java.lang.ref.SoftReference; import java.lang.ref.SoftReference;
import java.lang.ref.SoftReference;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; 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 * but they are synchronized. This is safe as long as structural changes aren't made to the same
* project storage element from multiple threads. * project storage element from multiple threads.
* *
* @see {ICDescriptor} for more * @see ICDescriptor for more
*/ */
final public class CConfigBasedDescriptorManager implements ICDescriptorManager { final public class CConfigBasedDescriptorManager implements ICDescriptorManager {
private volatile static CConfigBasedDescriptorManager fInstance; private volatile static CConfigBasedDescriptorManager fInstance;
@ -387,7 +386,7 @@ final public class CConfigBasedDescriptorManager implements ICDescriptorManager
*/ */
private static CConfigBasedDescriptor loadDescriptor(CProjectDescription des) throws CoreException { private static CConfigBasedDescriptor loadDescriptor(CProjectDescription des) throws CoreException {
if (des == null) if (des == null)
throw ExceptionFactory.createCoreException("CProjectDescription des is null"); throw ExceptionFactory.createCoreException("CProjectDescription des is null"); //$NON-NLS-1$
if(des.isReadOnly()) if(des.isReadOnly())
des = (CProjectDescription)CProjectDescriptionManager.getInstance().getProjectDescription(des.getProject(), true); des = (CProjectDescription)CProjectDescriptionManager.getInstance().getProjectDescription(des.getProject(), true);

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/ProjectMap.java
View file

@ -21,13 +21,9 @@ import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path; 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.CCorePlugin;
import org.eclipse.cdt.core.ICDescriptor; 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.core.settings.model.ICStorageElement;
import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner;