[245709] Replace JEM Logger code in EJB plugins
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/actions/EJBClientRemovalAction.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/actions/EJBClientRemovalAction.java
index 1de8104..4bc25cb 100644
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/actions/EJBClientRemovalAction.java
+++ b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/actions/EJBClientRemovalAction.java
@@ -92,7 +92,7 @@
try {
status = model.getDefaultOperation().execute(monitor, null);
} catch (ExecutionException e) {
- Logger.getLogger().logError(e);
+ EJBUIPlugin.logError(e);
}
return status;
}
@@ -143,7 +143,7 @@
}
// private void handleException(Shell shell, Exception e) {
-// Logger.getLogger().logError(e);
+// EJBUIPlugin.logError(e);
// MessageDialog.openError(shell, REMOVE_ERROR_TITLE, ERROR_REMOVING_CLIENT);
// }
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/plugin/EJBUIPlugin.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/plugin/EJBUIPlugin.java
index db7bbdf..15366a2 100644
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/plugin/EJBUIPlugin.java
+++ b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/plugin/EJBUIPlugin.java
@@ -17,6 +17,10 @@
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -54,4 +58,70 @@
public static IWorkspace getWorkspace() {
return ResourcesPlugin.getWorkspace();
}
+
+ /**
+ * Create a new IStatus with a severity using the EJBUIPlugin ID. aCode is just an internal code.
+ */
+ public static IStatus createStatus(int severity, int aCode, String aMessage, Throwable exception) {
+ return new Status(severity, PLUGIN_ID, aCode,
+ aMessage != null ? aMessage : "No message.", exception);
+ }
+
+ public static IStatus createStatus(int severity, String message, Throwable exception) {
+ return new Status(severity, PLUGIN_ID, message, exception);
+ }
+
+ public static IStatus createStatus(int severity, String message) {
+ return createStatus(severity, message, null);
+ }
+
+ public static IStatus createErrorStatus(int aCode, String aMessage, Throwable exception) {
+ return createStatus(IStatus.ERROR, aCode, aMessage != null ? aMessage : exception.toString(), exception);
+ }
+
+ /**
+ * Record an error against this plugin's log.
+ *
+ * @param aCode
+ * @param aMessage
+ * @param anException
+ */
+ public static void logError(int aCode, String aMessage,
+ Throwable anException) {
+ getDefault().getLog().log(
+ createErrorStatus(aCode, aMessage, anException));
+ }
+
+ /**
+ *
+ * Record a message against this plugin's log.
+ *
+ * @param severity
+ * @param aCode
+ * @param aMessage
+ * @param exception
+ */
+ public static void log(int severity, int aCode, String aMessage,
+ Throwable exception) {
+ log(createStatus(severity, aCode, aMessage, exception));
+ }
+
+ /**
+ *
+ * Record a status against this plugin's log.
+ *
+ * @param aStatus
+ */
+ public static void log(IStatus aStatus) {
+ getDefault().getLog().log(aStatus);
+ }
+
+ 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.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/NewEnterpriseBeanWizard.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/NewEnterpriseBeanWizard.java
index cc34528..cbff3fa 100644
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/NewEnterpriseBeanWizard.java
+++ b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/NewEnterpriseBeanWizard.java
@@ -20,9 +20,9 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.logger.proxy.Logger;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jst.ejb.ui.internal.plugin.EJBUIPlugin;
import org.eclipse.jst.j2ee.internal.plugin.J2EEEditorUtility;
import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
import org.eclipse.ui.INewWizard;
@@ -76,7 +76,7 @@
file = (IFile) javaProject.findType(className).getResource();
openEditor(file);
} catch (JavaModelException e) {
- Logger.getLogger().log(e);
+ EJBUIPlugin.logError(e);
}
}
@@ -89,7 +89,7 @@
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
IDE.openEditor(page, file, true);
} catch (PartInitException e) {
- Logger.getLogger().log(e);
+ EJBUIPlugin.logError(e);
}
}
});
