X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui.workbench%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Fworkbench%2FWorkbenchUiPlugin.java;h=02f8ac9ecc3ee4aefd1cd61832dafac09e29b8d6;hb=c31045fc95c6fe53e58a6d15f1166e3c9a4213a9;hp=a4e5ac39484d041b06d30649ac5aea96eb4bef65;hpb=0cdccc76ae0233aaaefeda94c13df7fdecfb43d1;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/WorkbenchUiPlugin.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/WorkbenchUiPlugin.java index a4e5ac394..02f8ac9ec 100644 --- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/WorkbenchUiPlugin.java +++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/WorkbenchUiPlugin.java @@ -35,16 +35,16 @@ import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; -/** - * The activator class controls the plug-in life cycle - */ +/** The activator class controls the plug-in life cycle */ public class WorkbenchUiPlugin extends AbstractUIPlugin implements ILogListener { - private final static Log log = LogFactory.getLog(WorkbenchUiPlugin.class); + // The plug-in ID + public final static String PLUGIN_ID = "org.argeo.cms.ui.workbench"; //$NON-NLS-1$ + private ResourceBundle messages; - private static BundleContext bundleContext; + public static InheritableThreadLocal display = new InheritableThreadLocal() { @Override @@ -53,9 +53,6 @@ public class WorkbenchUiPlugin extends AbstractUIPlugin implements ILogListener } }; - // The plug-in ID - // public final static String PLUGIN_ID = "org.argeo.security.ui"; //$NON-NLS-1$ - public final static String PLUGIN_ID = "org.argeo.cms.ui.workbench"; //$NON-NLS-1$ final static String CONTEXT_KEYRING = "KEYRING"; @@ -67,9 +64,7 @@ public class WorkbenchUiPlugin extends AbstractUIPlugin implements ILogListener public void start(BundleContext context) throws Exception { super.start(context); - bundleContext = context; - defaultCallbackHandler = new DefaultCallbackHandler(); defaultCallbackHandlerReg = context.registerService( CallbackHandler.class, defaultCallbackHandler, null); @@ -79,7 +74,6 @@ public class WorkbenchUiPlugin extends AbstractUIPlugin implements ILogListener Platform.addLogListener(this); if (log.isTraceEnabled()) log.trace("Eclipse logging now directed to standard logging"); - } public void stop(BundleContext context) throws Exception {