From 707380391ecea56434e6c19cc6b2770b9c752f60 Mon Sep 17 00:00:00 2001 From: David Inglis Date: Fri, 4 Oct 2002 18:11:18 +0000 Subject: [PATCH] no need to go through default is get plugin id --- .../src/org/eclipse/cdt/internal/core/CDescriptor.java | 6 +++--- .../org/eclipse/cdt/internal/core/CDescriptorManager.java | 2 +- .../src/org/eclipse/cdt/internal/core/COwner.java | 6 +++--- .../src/org/eclipse/cdt/internal/core/make/MakeBuilder.java | 2 +- .../src/org/eclipse/cdt/internal/core/make/MakeProject.java | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CDescriptor.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CDescriptor.java index 612f791e88c..6f7d72a64a2 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CDescriptor.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CDescriptor.java @@ -99,9 +99,9 @@ public class CDescriptor implements ICDescriptor { IStatus status; readCDTProject(descriptionPath); if ( fOwner.getID().equals(id)) { - status = new Status(IStatus.WARNING, CCorePlugin.getDefault().PLUGIN_ID, CCorePlugin.STATUS_CDTPROJECT_EXISTS, "CDTProject already exisits", (Throwable)null); + status = new Status(IStatus.WARNING, CCorePlugin.PLUGIN_ID, CCorePlugin.STATUS_CDTPROJECT_EXISTS, "CDTProject already exisits", (Throwable)null); } else { - status = new Status(IStatus.ERROR, CCorePlugin.getDefault().PLUGIN_ID, CCorePlugin.STATUS_CDTPROJECT_MISMATCH, "CDTProject already exisits but does not match owner ID of creator", (Throwable)null); + status = new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, CCorePlugin.STATUS_CDTPROJECT_MISMATCH, "CDTProject already exisits but does not match owner ID of creator", (Throwable)null); } throw new CoreException(status); } @@ -119,7 +119,7 @@ public class CDescriptor implements ICDescriptor { IPath descriptionPath = projectLocation.append(DESCRIPTION_FILE_NAME); if (!descriptionPath.toFile().exists()) { - IStatus status = new Status(IStatus.ERROR, CCorePlugin.getDefault().PLUGIN_ID, -1, "CDTProject file not found", (Throwable)null); + IStatus status = new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, -1, "CDTProject file not found", (Throwable)null); throw new CoreException(status); } readCDTProject(descriptionPath); diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CDescriptorManager.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CDescriptorManager.java index fd9204d3a1d..27c6bf32cc4 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CDescriptorManager.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CDescriptorManager.java @@ -79,7 +79,7 @@ public class CDescriptorManager implements IResourceChangeListener { fDescriptorMap = new HashMap(); } if ( fDescriptorMap.get(project) != null ) { - IStatus status = new Status(IStatus.ERROR, CCorePlugin.getDefault().PLUGIN_ID, CCorePlugin.STATUS_CDTPROJECT_EXISTS, "CDTProject already configured", (Throwable)null); + IStatus status = new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, CCorePlugin.STATUS_CDTPROJECT_EXISTS, "CDTProject already configured", (Throwable)null); throw new CoreException(status); } try { diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/COwner.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/COwner.java index 4c323b28cff..7b488ef4dd0 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/COwner.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/COwner.java @@ -27,7 +27,7 @@ public class COwner implements ICOwnerInfo { if (extpoint != null) { extension = extpoint.getExtension(ownerID); } else { - IStatus status = new Status(IStatus.ERROR, CCorePlugin.getDefault().PLUGIN_ID, -1, "Invalid CDTProject owner ID", (Throwable)null); + IStatus status = new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, -1, "Invalid CDTProject owner ID", (Throwable)null); throw new CoreException(status); } } @@ -62,7 +62,7 @@ public class COwner implements ICOwnerInfo { return; } } - IStatus status = new Status(IStatus.ERROR, CCorePlugin.getDefault().PLUGIN_ID, -1, "Invalid CDTProject owner extension", (Throwable)null); + IStatus status = new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, -1, "Invalid CDTProject owner extension", (Throwable)null); throw new CoreException(status); } @@ -75,7 +75,7 @@ public class COwner implements ICOwnerInfo { return; } } - IStatus status = new Status(IStatus.ERROR, CCorePlugin.getDefault().PLUGIN_ID, -1, "Invalid CDTProject owner extension", (Throwable)null); + IStatus status = new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, -1, "Invalid CDTProject owner extension", (Throwable)null); throw new CoreException(status); } diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/make/MakeBuilder.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/make/MakeBuilder.java index b65f7ef9d93..1e594c83f9e 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/make/MakeBuilder.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/make/MakeBuilder.java @@ -47,7 +47,7 @@ public class MakeBuilder extends AbstractCExtension implements ICBuilder { } public String getID() { - return CCorePlugin.getDefault().PLUGIN_ID + ".makeBuilder"; + return CCorePlugin.PLUGIN_ID + ".makeBuilder"; } public void setOptimization(IOptimization o) { diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/make/MakeProject.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/make/MakeProject.java index fca9ebb0c18..2acedf99250 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/make/MakeProject.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/make/MakeProject.java @@ -12,13 +12,13 @@ import org.eclipse.cdt.core.ICOwner; public class MakeProject implements ICOwner { public void configure(ICDescriptor cproject) { - ICExtensionReference ext = cproject.create(CCorePlugin.BUILDER_MODEL_ID, CCorePlugin.getDefault().PLUGIN_ID + ".makeBuilder"); + ICExtensionReference ext = cproject.create(CCorePlugin.BUILDER_MODEL_ID, CCorePlugin.PLUGIN_ID + ".makeBuilder"); ext.setExtensionData("command", "make"); } public void update(ICDescriptor cproject, String extensionID) { if ( extensionID.equals(CCorePlugin.BUILDER_MODEL_ID ) ) { - ICExtensionReference ext = cproject.create(CCorePlugin.BUILDER_MODEL_ID, CCorePlugin.getDefault().PLUGIN_ID + ".makeBuilder"); + ICExtensionReference ext = cproject.create(CCorePlugin.BUILDER_MODEL_ID, CCorePlugin.PLUGIN_ID + ".makeBuilder"); ext.setExtensionData("command", "make"); } }