#2310 Speedup Capella Startup

Remove missed deleted Activator reference in MANIFEST.MF (capella.doc) Remove declarations of PLUGIN_ID values in two activators. Change-Id: I0000000000000000000000000000000000000000 Signed-off-by: Arnaud Dieumegard <[email protected]>
eclipse-capella · Feb 3, 2022 · c5c1128 · c5c1128
1 parent 05e8f79
commit c5c1128
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.../org/polarsys/capella/common/platform/sirius/customisation/SiriusCustomizationPlugin.java b/.../org/polarsys/capella/common/platform/sirius/customisation/SiriusCustomizationPlugin.java
@@ -33,6 +33,7 @@
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
 import org.polarsys.capella.common.platform.sirius.customisation.uicallback.SiriusUiCallBack;
 
 /**
@@ -42,7 +43,7 @@
 public class SiriusCustomizationPlugin extends AbstractUIPlugin {
 
   /** The plug-in ID. */
-  public static final String PLUGIN_ID = "org.polarsys.capella.common.platform.sirius.customisation"; //$NON-NLS-1$
+  public static final String PLUGIN_ID = FrameworkUtil.getBundle(SiriusCustomizationPlugin.class).getSymbolicName();
 
   // The shared instance
   private static SiriusCustomizationPlugin plugin;

diff --git a/...mon.tools.report/src/org/polarsys/capella/common/tools/report/ReportManagerActivator.java b/...mon.tools.report/src/org/polarsys/capella/common/tools/report/ReportManagerActivator.java
@@ -20,6 +20,7 @@
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.Plugin;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
 import org.polarsys.capella.common.mdsofa.common.helper.ExtensionPointHelper;
 import org.polarsys.capella.common.tools.report.appenders.IFlushableAppenders;
 
@@ -35,7 +36,7 @@ public class ReportManagerActivator extends Plugin {
   // The shared instance
   private static ReportManagerActivator plugin;
 
-  private static final String REPORT_PLUGIN_ID = "org.polarsys.capella.common.tools.report"; //$NON-NLS-1$
+  private static final String REPORT_PLUGIN_ID = FrameworkUtil.getBundle(ReportManagerActivator.class).getSymbolicName();
 
   private List<Appender> appenders;
   private List<IFlushableAppenders> flushableAppenders;

diff --git a/doc/plugins/org.polarsys.capella.doc/META-INF/MANIFEST.MF b/doc/plugins/org.polarsys.capella.doc/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.doc;singleton:=true
 Bundle-Version: 6.0.0.qualifier
-Bundle-Activator: org.polarsys.capella.doc.Activator
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime