[205971] Remove use of JEM Logger and use plugin specific logging
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/ProductManager.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/ProductManager.java index cb4c829..33b596d 100644 --- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/ProductManager.java +++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/ProductManager.java
@@ -17,10 +17,10 @@ import java.util.Set; import org.eclipse.core.runtime.Platform; -import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.wst.common.project.facet.core.runtime.IRuntime; import org.eclipse.wst.common.project.facet.core.runtime.IRuntimeComponent; import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager; +import org.eclipse.wst.web.internal.WSTWebPlugin; public class ProductManager { @@ -146,7 +146,7 @@ int seperatorIndex = defaultProductRuntimeKey.indexOf(RUNTIME_SEPARATOR); if (seperatorIndex < 0 && seperatorIndex < defaultProductRuntimeKey.length()) { //Consider throwing an exception here. - Logger.getLogger().logError("Invalid default product runtime id. It should follow the format <facet runtime id>:<facet version>. Id processed: " + defaultProductRuntimeKey); //$NON-NLS-1$ + WSTWebPlugin.logError("Invalid default product runtime id. It should follow the format <facet runtime id>:<facet version>. Id processed: " + defaultProductRuntimeKey); //$NON-NLS-1$ return null; } String defaultRuntimeID = defaultProductRuntimeKey.substring(0, seperatorIndex);
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDelegate.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDelegate.java index 00c56f4..15276d6 100644 --- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDelegate.java +++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDelegate.java
@@ -20,7 +20,6 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; -import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.wst.common.componentcore.ComponentCore; import org.eclipse.wst.common.componentcore.datamodel.FacetDataModelProvider; import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities; @@ -31,6 +30,7 @@ import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation; import org.eclipse.wst.common.project.facet.core.IDelegate; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; +import org.eclipse.wst.web.internal.WSTWebPlugin; public class SimpleWebFacetInstallDelegate implements IDelegate { @@ -58,7 +58,7 @@ try { ((IDataModelOperation) model.getProperty(FacetDataModelProvider.NOTIFICATION_OPERATION)).execute(monitor, null); } catch (ExecutionException e) { - Logger.getLogger().logError(e); + WSTWebPlugin.logError(e); } } finally { if (monitor != null)
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPlugin.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPlugin.java index aacab9d..d14b6c8 100644 --- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPlugin.java +++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPlugin.java
@@ -95,4 +95,12 @@ MultiStatus status = new MultiStatus(PLUGIN_ID,IStatus.ERROR,new IStatus[]{exception.getStatus()},message,exception); Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( status ); } + + public static void logError(Throwable exception) { + Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, exception.getMessage(), exception)); + } + + public static void logError(CoreException exception) { + Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( exception.getStatus() ); + } }
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableFactory.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableFactory.java index 13d2de4..4c4c6f0 100644 --- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableFactory.java +++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableFactory.java
@@ -17,7 +17,6 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; -import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.wst.common.componentcore.ComponentCore; import org.eclipse.wst.common.componentcore.ModuleCoreNature; import org.eclipse.wst.common.componentcore.internal.StructureEdit; @@ -29,6 +28,7 @@ import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.model.ModuleDelegate; import org.eclipse.wst.server.core.util.ProjectModuleFactoryDelegate; +import org.eclipse.wst.web.internal.WSTWebPlugin; public class StaticWebDeployableFactory extends ProjectModuleFactoryDelegate { private static final String ID = "org.eclipse.wst.web.internal.deployables.static"; //$NON-NLS-1$ @@ -95,7 +95,7 @@ try { return createModuleDelegates(component); } catch (CoreException e) { - Logger.getLogger().write(e); + WSTWebPlugin.logError(e); } } return null; @@ -114,7 +114,7 @@ moduleDelegate.initialize(module); } } catch (Exception e) { - Logger.getLogger().write(e); + WSTWebPlugin.logError(e); } finally { if (module != null) { if (getModuleDelegate(module) == null)