Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoberto E. Escobar2012-04-16 17:53:10 +0000
committerRoberto E. Escobar2012-04-16 17:53:10 +0000
commitfc2bd3a1435862af41fbadab51aacf446aa83ee0 (patch)
tree8d13cd0e9a0a98e403e47fccac7a1ecc23dc5112 /plugins
parentf97e58b2c70927a2c896a06d99027ac0b760686f (diff)
downloadorg.eclipse.osee-fc2bd3a1435862af41fbadab51aacf446aa83ee0.tar.gz
org.eclipse.osee-fc2bd3a1435862af41fbadab51aacf446aa83ee0.tar.xz
org.eclipse.osee-fc2bd3a1435862af41fbadab51aacf446aa83ee0.zip
feature[ats_VGR8B]: Convert DSL integration to DS
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration/OSGI-INF/access.model.interpreter.xml8
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/CreateOseeTypeChangesReportOperation.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/OseeToXtextOperation.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/XTextToOseeTypeOperation.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/AccessModelInterpreterProxy.java71
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/AccessModelInterpreterServiceRegHandler.java60
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/DslIntegrationConstants.java (renamed from plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/Activator.java)21
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/OseeModelingServiceImpl.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui.integration/.project5
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui.integration/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui.integration/OSGI-INF/artifact.data.provider.xml7
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui.integration/build.properties5
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/Activator.java51
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/ArtifactDataProviderImpl.java (renamed from plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/ArtifactDataAccessor.java)8
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/ArtifactDataProviderServiceRegHandler.java50
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/DslUiIntegrationConstants.java20
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslArtifactUpdateOperation.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslRenderer.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/CreateEditorReportOperation.java6
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/OseeTypesExportOperation.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/OseeTypesImportOperation.java6
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/XtextOseeTypesHandler.java20
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/wizards/OseeTypesExportWizard.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OseeUiEarlyStartup.java16
25 files changed, 161 insertions, 224 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.dsl.integration/META-INF/MANIFEST.MF
index 521fa267d1..8ff6d021f0 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration/META-INF/MANIFEST.MF
@@ -26,7 +26,6 @@ Import-Package: org.eclipse.emf.compare.diff.metamodel,
org.osgi.framework
Require-Bundle: org.eclipse.xtext,
org.eclipse.core.runtime
-Bundle-Activator: org.eclipse.osee.framework.core.dsl.integration.internal.Activator
Export-Package: org.eclipse.osee.framework.core.dsl.integration,
org.eclipse.osee.framework.core.dsl.integration.util
-Service-Component: OSGI-INF/osee.dsl.modeling.service.xml
+Service-Component: OSGI-INF/*.xml
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration/OSGI-INF/access.model.interpreter.xml b/plugins/org.eclipse.osee.framework.core.dsl.integration/OSGI-INF/access.model.interpreter.xml
new file mode 100644
index 0000000000..61dc08c4a8
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration/OSGI-INF/access.model.interpreter.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop" name="org.eclipse.osee.framework.core.dsl.integration.internal.AccessModelInterpreterProxy">
+ <implementation class="org.eclipse.osee.framework.core.dsl.integration.internal.AccessModelInterpreterProxy"/>
+ <service>
+ <provide interface="org.eclipse.osee.framework.core.dsl.integration.AccessModelInterpreter"/>
+ </service>
+ <reference bind="setArtifactDataProvider" cardinality="1..1" interface="org.eclipse.osee.framework.core.dsl.integration.ArtifactDataProvider" name="ArtifactDataProvider" policy="static"/>
+</scr:component>
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/CreateOseeTypeChangesReportOperation.java b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/CreateOseeTypeChangesReportOperation.java
index f27a39bc84..7687062ec9 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/CreateOseeTypeChangesReportOperation.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/CreateOseeTypeChangesReportOperation.java
@@ -14,7 +14,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.dsl.integration.internal.Activator;
+import org.eclipse.osee.framework.core.dsl.integration.internal.DslIntegrationConstants;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.AbstractOseeType;
import org.eclipse.osee.framework.core.model.OseeEnumEntry;
@@ -35,7 +35,7 @@ public class CreateOseeTypeChangesReportOperation extends AbstractOperation {
private final List<TableData> tabs;
public CreateOseeTypeChangesReportOperation(OseeTypeCache cache, List<TableData> tabs) {
- super("Report Osee Type Changes", Activator.PLUGIN_ID);
+ super("Report Osee Type Changes", DslIntegrationConstants.PLUGIN_ID);
this.cache = cache;
this.tabs = tabs;
}
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/OseeToXtextOperation.java b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/OseeToXtextOperation.java
index edbd184c61..ad7c9b9005 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/OseeToXtextOperation.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/OseeToXtextOperation.java
@@ -17,7 +17,7 @@ import java.util.Map;
import java.util.Map.Entry;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.dsl.integration.internal.Activator;
+import org.eclipse.osee.framework.core.dsl.integration.internal.DslIntegrationConstants;
import org.eclipse.osee.framework.core.dsl.integration.util.OseeUtil;
import org.eclipse.osee.framework.core.dsl.oseeDsl.OseeDsl;
import org.eclipse.osee.framework.core.dsl.oseeDsl.OseeDslFactory;
@@ -48,7 +48,7 @@ public class OseeToXtextOperation extends AbstractOperation {
private final OseeTypeCache cache;
public OseeToXtextOperation(OseeTypeCache cache, OseeDslFactory factory, OseeDsl oseeModel) {
- super("OSEE to Text Model", Activator.PLUGIN_ID);
+ super("OSEE to Text Model", DslIntegrationConstants.PLUGIN_ID);
this.oseeModel = oseeModel;
this.factory = factory;
this.cache = cache;
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/XTextToOseeTypeOperation.java b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/XTextToOseeTypeOperation.java
index 131d80b7a1..0abf11a870 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/XTextToOseeTypeOperation.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/XTextToOseeTypeOperation.java
@@ -20,7 +20,7 @@ import java.util.Set;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.data.TokenFactory;
-import org.eclipse.osee.framework.core.dsl.integration.internal.Activator;
+import org.eclipse.osee.framework.core.dsl.integration.internal.DslIntegrationConstants;
import org.eclipse.osee.framework.core.dsl.integration.util.OseeUtil;
import org.eclipse.osee.framework.core.dsl.oseeDsl.AddEnum;
import org.eclipse.osee.framework.core.dsl.oseeDsl.OseeDsl;
@@ -60,7 +60,7 @@ public class XTextToOseeTypeOperation extends AbstractOperation {
private final BranchCache branchCache;
public XTextToOseeTypeOperation(IOseeModelFactoryService provider, OseeTypeCache typeCache, BranchCache branchCache, OseeDsl model) {
- super("OSEE Text Model to OSEE", Activator.PLUGIN_ID);
+ super("OSEE Text Model to OSEE", DslIntegrationConstants.PLUGIN_ID);
this.provider = provider;
this.typeCache = typeCache;
this.branchCache = branchCache;
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/AccessModelInterpreterProxy.java b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/AccessModelInterpreterProxy.java
new file mode 100644
index 0000000000..040e48b417
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/AccessModelInterpreterProxy.java
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2007 Boeing.
+ * 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:
+ * Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.framework.core.dsl.integration.internal;
+
+import java.util.Collection;
+import org.eclipse.osee.framework.core.data.IAccessContextId;
+import org.eclipse.osee.framework.core.dsl.integration.AccessModelInterpreter;
+import org.eclipse.osee.framework.core.dsl.integration.ArtifactDataProvider;
+import org.eclipse.osee.framework.core.dsl.integration.RestrictionHandler;
+import org.eclipse.osee.framework.core.dsl.oseeDsl.AccessContext;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.access.AccessDetailCollector;
+import org.eclipse.osee.framework.core.util.Conditions;
+
+/**
+ * @author Roberto E. Escobar
+ */
+public class AccessModelInterpreterProxy implements AccessModelInterpreter {
+
+ private ArtifactDataProvider artifactDataProvider;
+ private AccessModelInterpreter proxiedService;
+
+ public void setArtifactDataProvider(ArtifactDataProvider artifactDataProvider) {
+ this.artifactDataProvider = artifactDataProvider;
+ }
+
+ public void start() {
+ ArtifactMatchInterpreter matcher = new ArtifactMatchInterpreter();
+
+ RestrictionHandler<?>[] restrictionHandlers =
+ new RestrictionHandler<?>[] {
+ new ArtifactMatchRestrictionHandler(matcher),
+ new ArtifactTypeRestrictionHandler(),
+ new AttributeTypeRestrictionHandler(),
+ new RelationTypeRestrictionHandler(matcher)};
+
+ proxiedService = new AccessModelInterpreterImpl(artifactDataProvider, matcher, restrictionHandlers);
+ }
+
+ public void stop() {
+ proxiedService = null;
+ }
+
+ private AccessModelInterpreter getProxiedService() {
+ return proxiedService;
+ }
+
+ private void checkInitialized() throws OseeCoreException {
+ Conditions.checkNotNull(getProxiedService(), "AccessModelInterpreter");
+ }
+
+ @Override
+ public AccessContext getContext(Collection<AccessContext> contexts, IAccessContextId contextId) throws OseeCoreException {
+ checkInitialized();
+ return getProxiedService().getContext(contexts, contextId);
+ }
+
+ @Override
+ public void computeAccessDetails(AccessDetailCollector collector, AccessContext context, Object objectToCheck) throws OseeCoreException {
+ checkInitialized();
+ getProxiedService().computeAccessDetails(collector, context, objectToCheck);
+ }
+}
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/AccessModelInterpreterServiceRegHandler.java b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/AccessModelInterpreterServiceRegHandler.java
deleted file mode 100644
index ce3ccf2649..0000000000
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/AccessModelInterpreterServiceRegHandler.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * 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:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.dsl.integration.internal;
-
-import java.util.Map;
-import org.eclipse.osee.framework.core.dsl.integration.AccessModelInterpreter;
-import org.eclipse.osee.framework.core.dsl.integration.ArtifactDataProvider;
-import org.eclipse.osee.framework.core.dsl.integration.RestrictionHandler;
-import org.eclipse.osee.framework.core.util.AbstractTrackingHandler;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-
-/**
- * @author Roberto E. Escobar
- */
-public class AccessModelInterpreterServiceRegHandler extends AbstractTrackingHandler {
-
- private static final Class<?>[] SERVICE_DEPENDENCIES = new Class<?>[] {ArtifactDataProvider.class};
-
- private ServiceRegistration<?> registration;
-
- @Override
- public Class<?>[] getDependencies() {
- return SERVICE_DEPENDENCIES;
- }
-
- @Override
- public void onActivate(BundleContext context, Map<Class<?>, Object> services) {
- ArtifactDataProvider artifactDataProvider = getService(ArtifactDataProvider.class, services);
-
- ArtifactMatchInterpreter matcher = new ArtifactMatchInterpreter();
-
- RestrictionHandler<?>[] restrictionHandlers =
- new RestrictionHandler<?>[] {
- new ArtifactMatchRestrictionHandler(matcher),
- new ArtifactTypeRestrictionHandler(),
- new AttributeTypeRestrictionHandler(),
- new RelationTypeRestrictionHandler(matcher)};
-
- AccessModelInterpreter service =
- new AccessModelInterpreterImpl(artifactDataProvider, matcher, restrictionHandlers);
- registration = context.registerService(AccessModelInterpreter.class.getName(), service, null);
- }
-
- @Override
- public void onDeActivate() {
- if (registration != null) {
- registration.unregister();
- }
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/Activator.java b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/DslIntegrationConstants.java
index 7eaf54eb01..59294e6993 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/Activator.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/DslIntegrationConstants.java
@@ -10,25 +10,12 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.dsl.integration.internal;
-import org.eclipse.osee.framework.core.util.ServiceDependencyTracker;
-import org.eclipse.osee.framework.jdk.core.util.Lib;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
+public final class DslIntegrationConstants {
-public class Activator implements BundleActivator {
+ private DslIntegrationConstants() {
+ // Constants
+ }
public static final String PLUGIN_ID = "org.eclipse.osee.framework.core.dsl.integration";
- private ServiceDependencyTracker dependencyTracker2;
-
- @Override
- public void start(BundleContext context) throws Exception {
- dependencyTracker2 = new ServiceDependencyTracker(context, new AccessModelInterpreterServiceRegHandler());
- dependencyTracker2.open();
- }
-
- @Override
- public void stop(BundleContext context) throws Exception {
- Lib.close(dependencyTracker2);
- }
}
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/OseeModelingServiceImpl.java b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/OseeModelingServiceImpl.java
index 49fe4b4861..84bfe58640 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/OseeModelingServiceImpl.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/OseeModelingServiceImpl.java
@@ -130,7 +130,7 @@ public class OseeModelingServiceImpl implements IOseeModelingService {
ops.add(new OseeToXtextOperation(tempCache, modelFactory, baseModel));
ops.add(new EMFCompareOperation(baseModel, modifiedModel, comparisonSnapshot));
}
- IOperation operation = new CompositeOperation("Import Osee Types", Activator.PLUGIN_ID, ops);
+ IOperation operation = new CompositeOperation("Import Osee Types", DslIntegrationConstants.PLUGIN_ID, ops);
Operations.executeWorkAndCheckStatus(operation, monitor);
if (request.isPersistAllowed()) {
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/.project b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/.project
index c24987a47b..26a6f4880c 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/.project
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/.project
@@ -20,6 +20,11 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ds.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/META-INF/MANIFEST.MF
index a736d82ddb..de30544fc7 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: Osee DSL Ui Integration
Bundle-SymbolicName: org.eclipse.osee.framework.core.dsl.ui.integration;singleton:=true
Bundle-Version: 0.9.9.qualifier
-Bundle-Activator: org.eclipse.osee.framework.core.dsl.ui.integration.internal.Activator
Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.compare,
@@ -74,3 +73,4 @@ Require-Bundle: org.eclipse.osee.framework.core.dsl,
org.eclipse.xtext,
org.eclipse.ui.editors
Export-Package: org.eclipse.osee.framework.core.dsl.ui.integration.operations
+Service-Component: OSGI-INF/*.xml
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/OSGI-INF/artifact.data.provider.xml b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/OSGI-INF/artifact.data.provider.xml
new file mode 100644
index 0000000000..99d08818eb
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/OSGI-INF/artifact.data.provider.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.osee.framework.core.dsl.ui.integration.internal.ArtifactDataProviderImpl">
+ <implementation class="org.eclipse.osee.framework.core.dsl.ui.integration.internal.ArtifactDataProviderImpl"/>
+ <service>
+ <provide interface="org.eclipse.osee.framework.core.dsl.integration.ArtifactDataProvider"/>
+ </service>
+</scr:component>
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/build.properties b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/build.properties
index 803f4c9575..a73be1142d 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/build.properties
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/build.properties
@@ -1,6 +1,7 @@
-source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
images/,\
- plugin.xml
+ plugin.xml,\
+ OSGI-INF/
+source.. = src/
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/Activator.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/Activator.java
deleted file mode 100644
index 7df389a6dc..0000000000
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/Activator.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Boeing.
- * 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:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.dsl.ui.integration.internal;
-
-import org.eclipse.osee.framework.core.services.IOseeCachingService;
-import org.eclipse.osee.framework.core.util.ServiceDependencyTracker;
-import org.eclipse.osee.framework.jdk.core.util.Lib;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.util.tracker.ServiceTracker;
-
-public class Activator implements BundleActivator {
- public static final String PLUGIN_ID = "org.eclipse.osee.framework.core.dsl.ui.integration";
-
- private static Activator instance;
-
- private ServiceTracker cacheServiceTracker;
- private ServiceDependencyTracker dependencyTracker;
-
- @Override
- public void start(BundleContext context) throws Exception {
- Activator.instance = this;
-
- dependencyTracker = new ServiceDependencyTracker(context, new ArtifactDataProviderServiceRegHandler());
- dependencyTracker.open();
-
- cacheServiceTracker = new ServiceTracker(context, IOseeCachingService.class.getName(), null);
- cacheServiceTracker.open(true);
- }
-
- @Override
- public void stop(BundleContext bundleContext) throws Exception {
- Lib.close(dependencyTracker);
-
- if (cacheServiceTracker != null) {
- cacheServiceTracker.close();
- }
- }
-
- public static IOseeCachingService getOseeCacheService() {
- return (IOseeCachingService) Activator.instance.cacheServiceTracker.getService();
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/ArtifactDataAccessor.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/ArtifactDataProviderImpl.java
index 3efdec1294..acaada650d 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/ArtifactDataAccessor.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/ArtifactDataProviderImpl.java
@@ -27,7 +27,7 @@ import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-public final class ArtifactDataAccessor implements ArtifactDataProvider {
+public final class ArtifactDataProviderImpl implements ArtifactDataProvider {
@Override
public boolean isApplicable(Object object) {
@@ -35,7 +35,7 @@ public final class ArtifactDataAccessor implements ArtifactDataProvider {
try {
result = asCastedObject(object) != null;
} catch (OseeCoreException ex) {
- OseeLog.log(Activator.class, Level.SEVERE, ex);
+ OseeLog.log(DslUiIntegrationConstants.class, Level.SEVERE, ex);
}
return result;
}
@@ -96,13 +96,13 @@ public final class ArtifactDataAccessor implements ArtifactDataProvider {
artifactPtr = artifactPtr.getParent();
}
} catch (OseeCoreException ex) {
- OseeLog.log(Activator.class, Level.SEVERE, ex);
+ OseeLog.log(DslUiIntegrationConstants.class, Level.SEVERE, ex);
}
return hierarchy;
}
@Override
- public boolean matches(Identity... identities) {
+ public boolean matches(Identity<?>... identities) {
return self.matches(identities);
}
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/ArtifactDataProviderServiceRegHandler.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/ArtifactDataProviderServiceRegHandler.java
deleted file mode 100644
index 579f649266..0000000000
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/ArtifactDataProviderServiceRegHandler.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * 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:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.dsl.ui.integration.internal;
-
-import java.util.Map;
-import org.eclipse.osee.framework.core.dsl.integration.ArtifactDataProvider;
-import org.eclipse.osee.framework.core.services.IOseeCachingService;
-import org.eclipse.osee.framework.core.util.AbstractTrackingHandler;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-
-/**
- * @author Roberto E. Escobar
- */
-public class ArtifactDataProviderServiceRegHandler extends AbstractTrackingHandler {
-
- private static final Class<?>[] SERVICE_DEPENDENCIES = new Class<?>[] {
- //
- IOseeCachingService.class, //
- };
-
- private ServiceRegistration registration;
-
- @Override
- public Class<?>[] getDependencies() {
- return SERVICE_DEPENDENCIES;
- }
-
- @Override
- public void onActivate(BundleContext context, Map<Class<?>, Object> services) {
- ArtifactDataProvider artifactDataProvider = new ArtifactDataAccessor();
- registration = context.registerService(ArtifactDataProvider.class.getName(), artifactDataProvider, null);
- }
-
- @Override
- public void onDeActivate() {
- if (registration != null) {
- registration.unregister();
- }
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/DslUiIntegrationConstants.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/DslUiIntegrationConstants.java
new file mode 100644
index 0000000000..ece432faec
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/DslUiIntegrationConstants.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Boeing.
+ * 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:
+ * Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.framework.core.dsl.ui.integration.internal;
+
+public final class DslUiIntegrationConstants {
+
+ private DslUiIntegrationConstants() {
+ //Constants
+ }
+
+ public static final String PLUGIN_ID = "org.eclipse.osee.framework.core.dsl.ui.integration";
+}
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslArtifactUpdateOperation.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslArtifactUpdateOperation.java
index 2ad476434e..168be8a5a4 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslArtifactUpdateOperation.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslArtifactUpdateOperation.java
@@ -39,7 +39,7 @@ public class OseeDslArtifactUpdateOperation extends AbstractOperation {
private final OseeDslSegmentParser parser;
public OseeDslArtifactUpdateOperation(OseeDslSegmentParser parser, File file) {
- super("OseeDsl Artifact Update", Activator.PLUGIN_ID);
+ super("OseeDsl Artifact Update", DslUiIntegrationConstants.PLUGIN_ID);
this.file = file;
this.parser = parser;
}
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslRenderer.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslRenderer.java
index 32b51bbcde..2036f27f06 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslRenderer.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslRenderer.java
@@ -104,7 +104,7 @@ public final class OseeDslRenderer extends FileSystemRenderer {
IDE.openEditor(page, file);
}
} catch (CoreException ex) {
- OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
+ OseeLog.log(DslUiIntegrationConstants.class, OseeLevel.SEVERE_POPUP, ex);
}
}
}
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/CreateEditorReportOperation.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/CreateEditorReportOperation.java
index c93229eec8..079d3e1ad7 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/CreateEditorReportOperation.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/CreateEditorReportOperation.java
@@ -19,7 +19,7 @@ import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
import org.eclipse.nebula.widgets.xviewer.XViewerColumn.SortDataType;
-import org.eclipse.osee.framework.core.dsl.ui.integration.internal.Activator;
+import org.eclipse.osee.framework.core.dsl.ui.integration.internal.DslUiIntegrationConstants;
import org.eclipse.osee.framework.core.model.TableData;
import org.eclipse.osee.framework.core.operation.AbstractOperation;
import org.eclipse.osee.framework.core.operation.Operations;
@@ -40,7 +40,7 @@ public class CreateEditorReportOperation extends AbstractOperation {
private final String reportName;
public CreateEditorReportOperation(String reportName, Collection<TableData> tableData) {
- super("Generate Report", Activator.PLUGIN_ID);
+ super("Generate Report", DslUiIntegrationConstants.PLUGIN_ID);
this.tableData = tableData;
this.reportName = reportName;
}
@@ -73,7 +73,7 @@ public class CreateEditorReportOperation extends AbstractOperation {
status = Status.OK_STATUS;
} catch (Exception ex) {
status =
- new Status(IStatus.ERROR, Activator.PLUGIN_ID, String.format("Error creating %s Report", reportName),
+ new Status(IStatus.ERROR, DslUiIntegrationConstants.PLUGIN_ID, String.format("Error creating %s Report", reportName),
ex);
}
return status;
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/OseeTypesExportOperation.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/OseeTypesExportOperation.java
index 15db5ba908..40bae186ea 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/OseeTypesExportOperation.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/OseeTypesExportOperation.java
@@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
import org.eclipse.osee.framework.core.client.server.HttpUrlBuilderClient;
import org.eclipse.osee.framework.core.data.OseeServerContext;
-import org.eclipse.osee.framework.core.dsl.ui.integration.internal.Activator;
+import org.eclipse.osee.framework.core.dsl.ui.integration.internal.DslUiIntegrationConstants;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.operation.AbstractOperation;
import org.eclipse.osee.framework.core.util.Conditions;
@@ -32,7 +32,7 @@ public class OseeTypesExportOperation extends AbstractOperation {
private final OutputStream outputStream;
public OseeTypesExportOperation(OutputStream outputStream) {
- super("Export Osee Types Model", Activator.PLUGIN_ID);
+ super("Export Osee Types Model", DslUiIntegrationConstants.PLUGIN_ID);
this.outputStream = outputStream;
}
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/OseeTypesImportOperation.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/OseeTypesImportOperation.java
index d0bce5aa28..5d33421dda 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/OseeTypesImportOperation.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/OseeTypesImportOperation.java
@@ -27,7 +27,7 @@ import org.eclipse.emf.compare.diff.metamodel.ComparisonSnapshot;
import org.eclipse.emf.compare.ui.editor.ModelCompareEditorInput;
import org.eclipse.osee.framework.core.data.OseeServerContext;
import org.eclipse.osee.framework.core.dsl.integration.util.ModelUtil;
-import org.eclipse.osee.framework.core.dsl.ui.integration.internal.Activator;
+import org.eclipse.osee.framework.core.dsl.ui.integration.internal.DslUiIntegrationConstants;
import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
import org.eclipse.osee.framework.core.model.OseeImportModelRequest;
import org.eclipse.osee.framework.core.model.OseeImportModelResponse;
@@ -54,7 +54,7 @@ public class OseeTypesImportOperation extends AbstractOperation {
private final boolean createCompareReport;
public OseeTypesImportOperation(IOseeCachingService cacheService, URI model, boolean createTypeChangeReport, boolean createCompareReport, boolean isPersistAllowed) {
- super("Import Osee Types Model", Activator.PLUGIN_ID);
+ super("Import Osee Types Model", DslUiIntegrationConstants.PLUGIN_ID);
this.cacheService = cacheService;
this.model = model;
this.isPersistAllowed = isPersistAllowed;
@@ -126,7 +126,7 @@ public class OseeTypesImportOperation extends AbstractOperation {
page.openEditor(input, "org.eclipse.compare.CompareEditor", true);
status = Status.OK_STATUS;
} catch (Exception ex) {
- status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error opening compare editor", ex);
+ status = new Status(IStatus.ERROR, DslUiIntegrationConstants.PLUGIN_ID, "Error opening compare editor", ex);
}
return status;
}
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/XtextOseeTypesHandler.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/XtextOseeTypesHandler.java
index 966955dd9b..7a84dfa06c 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/XtextOseeTypesHandler.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/XtextOseeTypesHandler.java
@@ -12,13 +12,17 @@ package org.eclipse.osee.framework.core.dsl.ui.integration.operations;
import java.net.URI;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.dsl.ui.integration.internal.Activator;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.operation.IOperation;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.core.services.IOseeCachingService;
+import org.eclipse.osee.framework.core.util.Conditions;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.skynet.core.importing.IOseeTypesHandler;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
/**
* @author Roberto E. Escobar
@@ -27,7 +31,7 @@ public class XtextOseeTypesHandler implements IOseeTypesHandler {
@Override
public void execute(IProgressMonitor monitor, URI uri) throws OseeCoreException {
- IOseeCachingService cacheService = Activator.getOseeCacheService();
+ IOseeCachingService cacheService = getCachingService();
IOperation operation = new OseeTypesImportOperation(cacheService, uri, false, false, true);
Operations.executeWorkAndCheckStatus(operation, monitor);
}
@@ -36,4 +40,16 @@ public class XtextOseeTypesHandler implements IOseeTypesHandler {
public boolean isApplicable(String resource) {
return Strings.isValid(resource) && resource.endsWith(".osee");
}
+
+ private IOseeCachingService getCachingService() throws OseeCoreException {
+ Bundle bundle = FrameworkUtil.getBundle(getClass());
+ Conditions.checkNotNull(bundle, "bundle");
+ BundleContext bundleContext = bundle.getBundleContext();
+ Conditions.checkNotNull(bundleContext, "bundleContext");
+ ServiceReference<IOseeCachingService> reference = bundleContext.getServiceReference(IOseeCachingService.class);
+ IOseeCachingService cacheService = bundleContext.getService(reference);
+ Conditions.checkNotNull(cacheService, "cacheService");
+ return cacheService;
+ }
+
}
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/wizards/OseeTypesExportWizard.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/wizards/OseeTypesExportWizard.java
index d4b3482817..d1dcb70e45 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/wizards/OseeTypesExportWizard.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/wizards/OseeTypesExportWizard.java
@@ -20,7 +20,7 @@ import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.runtime.jobs.JobChangeAdapter;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.osee.framework.core.dsl.ui.integration.internal.Activator;
+import org.eclipse.osee.framework.core.dsl.ui.integration.internal.DslUiIntegrationConstants;
import org.eclipse.osee.framework.core.dsl.ui.integration.operations.OseeTypesExportOperation;
import org.eclipse.osee.framework.core.operation.IOperation;
import org.eclipse.osee.framework.core.operation.Operations;
@@ -61,7 +61,7 @@ public class OseeTypesExportWizard extends Wizard implements IImportWizard {
}
});
} catch (FileNotFoundException ex) {
- OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
+ OseeLog.log(DslUiIntegrationConstants.class, OseeLevel.SEVERE_POPUP, ex);
} finally {
Lib.close(fos);
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OseeUiEarlyStartup.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OseeUiEarlyStartup.java
index e41b8b07b5..0711ef6e7c 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OseeUiEarlyStartup.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OseeUiEarlyStartup.java
@@ -10,14 +10,11 @@
*******************************************************************************/
package org.eclipse.osee.framework.ui.skynet;
-import java.util.logging.Level;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.UserManager;
import org.eclipse.osee.framework.skynet.core.utility.DbUtil;
import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactSaveNotificationHandler;
import org.eclipse.osee.framework.ui.skynet.blam.operation.SetWorkbenchOverrideIconBlam;
-import org.eclipse.osee.framework.ui.skynet.internal.Activator;
import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.ui.IPartListener;
import org.eclipse.ui.IPerspectiveDescriptor;
@@ -29,7 +26,6 @@ import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.ViewPart;
-import org.osgi.framework.Bundle;
/**
* @author Ryan Schmitt
@@ -140,19 +136,7 @@ public class OseeUiEarlyStartup implements IStartup {
});
}
});
- startOseeDsl();
}
WorkspaceContributionItem.addToAllViews();
}
-
- private void startOseeDsl() {
- try {
- Bundle bundle = Platform.getBundle("org.eclipse.osee.framework.core.dsl.ui.integration");
- if (bundle.getState() != Bundle.ACTIVE) {
- bundle.start();
- }
- } catch (Exception ex) {
- OseeLog.log(Activator.class, Level.SEVERE, ex);
- }
- }
}

Back to the top