Temporary workaround to force EEF plugin properties and eef.adapters …

…activation at startup The UML Designer EEF properties plugin is activated at startup. Then from the start method we call a method of the EEF adapetrs plugin to force the plugin activation.
ObeoNetwork · Sep 22, 2015 · a0e372f · a0e372f
1 parent c61bd5d
commit a0e372f
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 36 deletions.
diff --git a/plugins/org.obeonetwork.dsl.uml2.properties/META-INF/MANIFEST.MF b/plugins/org.obeonetwork.dsl.uml2.properties/META-INF/MANIFEST.MF
@@ -17,7 +17,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.transaction,
  org.eclipse.sirius.ui,
  org.eclipse.sirius.common.ui,
- org.eclipse.ui.navigator
+ org.eclipse.ui.navigator,
+ org.eclipse.sirius.eef.adapters
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Export-Package: org.obeonetwork.dsl.uml2.properties,

diff --git a/plugins/org.obeonetwork.dsl.uml2.properties/plugin.xml b/plugins/org.obeonetwork.dsl.uml2.properties/plugin.xml
@@ -492,5 +492,11 @@ Contributors:
                tab="TaggedValues">
          </propertySection>
       </propertySections>
+   </extension>
+   <extension
+         point="org.eclipse.ui.startup">
+      <startup
+            class="org.obeonetwork.dsl.uml2.properties.UmlEarlyStartup">
+      </startup>
    </extension>
     </plugin>
diff --git a/...rg.obeonetwork.dsl.uml2.properties/src/org/obeonetwork/dsl/uml2/properties/Activator.java b/...rg.obeonetwork.dsl.uml2.properties/src/org/obeonetwork/dsl/uml2/properties/Activator.java
@@ -20,45 +20,47 @@
  */
 public class Activator extends AbstractUIPlugin {
 
-	/** The plug-in ID. */
-	public static final String PLUGIN_ID = "org.obeonetwork.dsl.uml2.properties"; //$NON-NLS-1$
+    /** The plug-in ID. */
+    public static final String PLUGIN_ID = "org.obeonetwork.dsl.uml2.properties"; //$NON-NLS-1$
 
-	/** The shared instance. */
-	private static Activator plugin;
+    /** The shared instance. */
+    private static Activator plugin;
 
-	/**
-	 * The constructor.
-	 */
-	public Activator() {
-	}
+    /**
+     * The constructor.
+     */
+    public Activator() {
+    }
 
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
+    /**
+     * {@inheritDoc}
+     * 
+     * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+     */
+    @Override
+    public void start(BundleContext context) throws Exception {
+        super.start(context);
+        plugin = this;
+    }
 
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
+    /**
+     * {@inheritDoc}
+     * 
+     * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+     */
+    @Override
+    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;
-	}
+    /**
+     * Returns the shared instance.
+     * 
+     * @return the shared instance
+     */
+    public static Activator getDefault() {
+        return plugin;
+    }
 
 }
diff --git a/...onetwork.dsl.uml2.properties/src/org/obeonetwork/dsl/uml2/properties/UmlEarlyStartup.java b/...onetwork.dsl.uml2.properties/src/org/obeonetwork/dsl/uml2/properties/UmlEarlyStartup.java
@@ -0,0 +1,12 @@
+package org.obeonetwork.dsl.uml2.properties;
+
+import org.eclipse.ui.IStartup;
+
+public class UmlEarlyStartup implements IStartup {
+
+    public void earlyStartup() {
+        // Call a method of the eef adapters just to activate the plugin
+        org.eclipse.sirius.eef.adapters.Activator.getDefault();
+    }
+
+}