From 0628cc9ef910f48c906b27347a4c6285f9a175d8 Mon Sep 17 00:00:00 2001 From: David Inglis Date: Wed, 19 May 2004 13:12:16 +0000 Subject: [PATCH] removed deprecated dependency --- .../eclipse/cdt/internal/core/model/CModelManager.java | 4 ++-- .../model/org/eclipse/cdt/internal/core/model/Util.java | 8 ++------ .../org/eclipse/cdt/internal/core/CDescriptorManager.java | 4 ++-- 3 files changed, 6 insertions(+), 10 deletions(-) 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 2fd1491bbb8..5c64bded632 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 @@ -154,7 +154,7 @@ public class CModelManager implements IResourceChangeListener, ICDescriptorListe // Register to the workspace; ResourcesPlugin.getWorkspace().addResourceChangeListener(factory, - IResourceChangeEvent.PRE_AUTO_BUILD + IResourceChangeEvent.PRE_BUILD | IResourceChangeEvent.POST_CHANGE | IResourceChangeEvent.PRE_DELETE | IResourceChangeEvent.PRE_CLOSE); @@ -679,7 +679,7 @@ public class CModelManager implements IResourceChangeListener, ICDescriptorListe } break; - case IResourceChangeEvent.PRE_AUTO_BUILD : + case IResourceChangeEvent.PRE_BUILD : // No need now. if(delta != null) { this.checkProjectsBeingAddedOrRemoved(delta); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Util.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Util.java index 1c1002a0d36..c51be2c15bf 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Util.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Util.java @@ -151,9 +151,7 @@ public class Util implements ICLogConstants { * Add a log entry */ public static void log(Throwable e, String message, LogConst logType) { - IStatus status = new Status(IStatus.ERROR, CCorePlugin.getDefault() - .getDescriptor().getUniqueIdentifier(), IStatus.ERROR, message, - e); + IStatus status = new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, IStatus.ERROR, message,e); Util.log(status, logType); } @@ -166,9 +164,7 @@ public class Util implements ICLogConstants { } public static void log(String message, LogConst logType) { - IStatus status = new Status(IStatus.INFO, CCorePlugin.getDefault() - .getDescriptor().getUniqueIdentifier(), IStatus.INFO, message, - null); + IStatus status = new Status(IStatus.INFO, CCorePlugin.PLUGIN_ID, IStatus.INFO, message, null); Util.log(status, logType); } 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 1ad2a67a82a..2939a6a302c 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 @@ -105,7 +105,7 @@ public class CDescriptorManager implements ICDescriptorManager, IResourceChangeL } }); getWorkspace().addResourceChangeListener(this, - IResourceChangeEvent.PRE_AUTO_BUILD | IResourceChangeEvent.PRE_DELETE | IResourceChangeEvent.PRE_CLOSE); + IResourceChangeEvent.PRE_BUILD | IResourceChangeEvent.PRE_DELETE | IResourceChangeEvent.PRE_CLOSE); } /** @@ -127,7 +127,7 @@ public class CDescriptorManager implements ICDescriptorManager, IResourceChangeL } } break; - case IResourceChangeEvent.PRE_AUTO_BUILD : + case IResourceChangeEvent.PRE_BUILD : IResourceDelta resDelta = event.getDelta(); if (resDelta == null) { break;