Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcletavernie2011-12-16 08:40:47 +0000
committercletavernie2011-12-16 08:40:47 +0000
commitd5c8c17d477d1e9a5dacb0f3af20beea87e9732a (patch)
tree950ec971f7b206457887edc9b129c355b6956908 /plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse
parentf0057c1e3441ec90da4771ee7d31f98e357ba0b1 (diff)
downloadorg.eclipse.papyrus-d5c8c17d477d1e9a5dacb0f3af20beea87e9732a.tar.gz
org.eclipse.papyrus-d5c8c17d477d1e9a5dacb0f3af20beea87e9732a.tar.xz
org.eclipse.papyrus-d5c8c17d477d1e9a5dacb0f3af20beea87e9732a.zip
ASSIGNED - bug 363279: [SysML Block Definition Diagram] Element icon of flowport in flowports compartment does not reflect flowport direction
https://bugs.eclipse.org/bugs/show_bug.cgi?id=363279 => Adding a common label provider based on elements instead of EClasses of element. Thus, information about direction for example is available. =>> The label provider was created in the activator, which can lead to problem with service registry/active editor scheme. Now, it is created on demand. Merged to the trunk
Diffstat (limited to 'plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse')
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/Activator.java15
1 files changed, 10 insertions, 5 deletions
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/Activator.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/Activator.java
index e1f3d020778..7943ab2bc67 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/Activator.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/Activator.java
@@ -62,6 +62,7 @@ public class Activator extends AbstractUIPlugin {
*
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
@@ -71,9 +72,6 @@ public class Activator extends AbstractUIPlugin {
// prepare the composed adapter factory
adapterFactory = createAdapterFactory();
-
- // add a generic label provider for sysml elements
- labelProvider = new UMLLabelProvider();
}
/*
@@ -81,11 +79,14 @@ public class Activator extends AbstractUIPlugin {
*
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
adapterFactory.dispose();
adapterFactory = null;
- labelProvider.dispose();
- labelProvider = null;
+ if(labelProvider != null) {
+ labelProvider.dispose();
+ labelProvider = null;
+ }
plugin = null;
super.stop(context);
}
@@ -249,6 +250,10 @@ public class Activator extends AbstractUIPlugin {
* @return a label provider supported by EMF Facet
*/
public LabelProvider getLabelProvider() {
+ if(labelProvider == null) {
+ // add a generic label provider for sysml elements
+ labelProvider = new UMLLabelProvider();
+ }
return labelProvider;
}

Back to the top