diff options
5 files changed, 58 insertions, 51 deletions
diff --git a/features/org.eclipse.emf.cdo-feature/feature.xml b/features/org.eclipse.emf.cdo-feature/feature.xml index 5233f1e143..37985c989e 100644 --- a/features/org.eclipse.emf.cdo-feature/feature.xml +++ b/features/org.eclipse.emf.cdo-feature/feature.xml @@ -77,6 +77,13 @@ unpack="false"/> <plugin + id="org.eclipse.emf.cdo.ui.branch" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin id="org.eclipse.emf.cdo.ui.ide" download-size="0" install-size="0" diff --git a/features/org.eclipse.emf.cdo.sdk-feature/feature.xml b/features/org.eclipse.emf.cdo.sdk-feature/feature.xml index 4c483584b5..a3fe47eb47 100644 --- a/features/org.eclipse.emf.cdo.sdk-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.sdk-feature/feature.xml @@ -72,6 +72,7 @@ <plugin id="org.eclipse.emf.cdo.team.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin id="org.eclipse.emf.cdo.ui.defs.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin id="org.eclipse.emf.cdo.ui.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/> + <plugin id="org.eclipse.emf.cdo.ui.branch.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin id="org.eclipse.emf.cdo.ui.ide.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/> </feature> diff --git a/plugins/org.eclipse.emf.cdo.ui.branch/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui.branch/META-INF/MANIFEST.MF index d782fad8b0..b5b4a513fd 100644 --- a/plugins/org.eclipse.emf.cdo.ui.branch/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.ui.branch/META-INF/MANIFEST.MF @@ -4,10 +4,11 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.emf.cdo.ui.branch;singleton:=true Bundle-Version: 3.0.0.qualifier -Bundle-Activator: org.eclipse.emf.cdo.ui.internal.branch.bundle.Activator +Bundle-Activator: org.eclipse.emf.cdo.ui.internal.branch.bundle.OM$Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.ui;bundle-version="[3.4.0,4.0.0)";visibility:=reexport, + org.eclipse.emf.cdo.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, org.eclipse.zest.core;bundle-version="[1.2.0,2.0.0)", org.eclipse.zest.layouts;bundle-version="[1.1.0,2.0.0)" Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.emf.cdo.ui.branch/src/org/eclipse/emf/cdo/ui/internal/branch/bundle/Activator.java b/plugins/org.eclipse.emf.cdo.ui.branch/src/org/eclipse/emf/cdo/ui/internal/branch/bundle/Activator.java deleted file mode 100644 index 0a0f7e8795..0000000000 --- a/plugins/org.eclipse.emf.cdo.ui.branch/src/org/eclipse/emf/cdo/ui/internal/branch/bundle/Activator.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.eclipse.emf.cdo.ui.internal.branch.bundle; - -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class Activator extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "org.eclipse.cdo.ui.branch"; - - // The shared instance - private static Activator plugin; - - /** - * The constructor - */ - public Activator() { - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static Activator getDefault() { - return plugin; - } - -} diff --git a/plugins/org.eclipse.emf.cdo.ui.branch/src/org/eclipse/emf/cdo/ui/internal/branch/bundle/OM.java b/plugins/org.eclipse.emf.cdo.ui.branch/src/org/eclipse/emf/cdo/ui/internal/branch/bundle/OM.java new file mode 100644 index 0000000000..133ba39453 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.ui.branch/src/org/eclipse/emf/cdo/ui/internal/branch/bundle/OM.java @@ -0,0 +1,48 @@ +/** + * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation + * Victor Roldan Betancort - maintenance + */ +package org.eclipse.emf.cdo.ui.internal.branch.bundle; + +import org.eclipse.net4j.util.om.OMBundle; +import org.eclipse.net4j.util.om.OMPlatform; +import org.eclipse.net4j.util.om.log.OMLogger; +import org.eclipse.net4j.util.om.trace.OMTracer; +import org.eclipse.net4j.util.ui.UIActivator; + +/** + * The <em>Operations & Maintenance</em> class of this bundle. + * + * @author Eike Stepper + */ +public abstract class OM +{ + public static final String BUNDLE_ID = "org.eclipse.emf.cdo.ui.branch"; //$NON-NLS-1$ + + public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class); + + public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$ + + public static final OMLogger LOG = BUNDLE.logger(); + + /** + * @author Eike Stepper + */ + public static final class Activator extends UIActivator + { + public static Activator INSTANCE; + + public Activator() + { + super(BUNDLE); + INSTANCE = this; + } + } +} |