Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian W. Damus2016-01-21 13:58:28 +0000
committerGerrit Code Review @ Eclipse.org2016-01-22 14:13:36 +0000
commit933ef683155a709c672ec90c1fe948d54ccaa9cb (patch)
tree85aec72ee01d9b414cca1c9c0f80208d673e52df /plugins/uml
parentd7ee061ebceb858823a390b8e62e6b0518916994 (diff)
downloadorg.eclipse.papyrus-933ef683155a709c672ec90c1fe948d54ccaa9cb.tar.gz
org.eclipse.papyrus-933ef683155a709c672ec90c1fe948d54ccaa9cb.tar.xz
org.eclipse.papyrus-933ef683155a709c672ec90c1fe948d54ccaa9cb.zip
Bug 481830: [All Diagrams - Generation] Initializing GMF Preferences from the Bundle's Activator may cause Deadlocks
https://bugs.eclipse.org/bugs/show_bug.cgi?id=481830 Ensure that the loading of constraint classes by the properties ConfigurationManager does not, of itself, trigger lazy bundle activation.
Diffstat (limited to 'plugins/uml')
-rw-r--r--plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/internal/constraints/DurationLinkConstraint.java (renamed from plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/DurationLinkConstraint.java)2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/prop/Environment.xmi2
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF2
5 files changed, 6 insertions, 6 deletions
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF
index 8b42fcf141b..72d5daa1818 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF
@@ -26,7 +26,7 @@ Export-Package: org.eclipse.papyrus.uml.decoratormodel.internal.properties.const
org.eclipse.papyrus.uml.decoratormodel.properties.elements,
org.eclipse.papyrus.uml.decoratormodel.properties.widgets
Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
+Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.papyrus.uml.decoratormodel.internal.properties.constraints"
Bundle-Version: 1.2.0.qualifier
Bundle-Name: %Bundle-Name
Bundle-ManifestVersion: 2
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
index 3fcf08f2a0c..3eac3071c36 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
@@ -3,10 +3,11 @@ Export-Package: org.eclipse.papyrus.uml.diagram.sequence,
org.eclipse.papyrus.uml.diagram.sequence.edit.parts,
org.eclipse.papyrus.uml.diagram.sequence.edit.policies,
org.eclipse.papyrus.uml.diagram.sequence.figures,
+ org.eclipse.papyrus.uml.diagram.sequence.internal.constraints;x-internal:=true,
org.eclipse.papyrus.uml.diagram.sequence.part,
org.eclipse.papyrus.uml.diagram.sequence.providers,
org.eclipse.papyrus.uml.diagram.sequence.util
-Bundle-ActivationPolicy: lazy
+Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.papyrus.uml.diagram.sequence.internal.constraints"
Bundle-ClassPath: .
Bundle-Name: %pluginName
Bundle-Localization: plugin
@@ -72,7 +73,6 @@ Require-Bundle: org.eclipse.core.expressions,
org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="1.2.0",
com.google.guava;bundle-version="11.0.0"
Bundle-Vendor: %providerName
-Eclipse-LazyStart: true
Bundle-Version: 1.2.0.qualifier
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/DurationLinkConstraint.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/internal/constraints/DurationLinkConstraint.java
index a724044f542..f2ede776247 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/DurationLinkConstraint.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/internal/constraints/DurationLinkConstraint.java
@@ -12,7 +12,7 @@
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.sequence.util;
+package org.eclipse.papyrus.uml.diagram.sequence.internal.constraints;
import org.eclipse.gef.EditPart;
import org.eclipse.papyrus.infra.constraints.SimpleConstraint;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/prop/Environment.xmi b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/prop/Environment.xmi
index 926e37b589b..ca0bde5c48b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/prop/Environment.xmi
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/prop/Environment.xmi
@@ -6,5 +6,5 @@
<modelElementFactories name="Gate Factory" factoryClass="org.eclipse.papyrus.uml.diagram.sequence.util.GateModelElementFactory"/>
<modelElementFactories name="Link Route Factory" factoryClass="org.eclipse.papyrus.uml.diagram.sequence.util.LinkRouteModelElementFactory"/>
<modelElementFactories name="Behavior Factory" factoryClass="org.eclipse.papyrus.uml.diagram.sequence.util.BehaviorDisplayHelper"/>
- <constraintTypes label="Duration Link Constraint" constraintClass="org.eclipse.papyrus.uml.diagram.sequence.util.DurationLinkConstraint"/>
+ <constraintTypes label="Duration Link Constraint" constraintClass="org.eclipse.papyrus.uml.diagram.sequence.internal.constraints.DurationLinkConstraint"/>
</environment:Environment>
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF
index 3fa7ae04d3d..f6500709f0b 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF
@@ -59,7 +59,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.2.0",
org.eclipse.papyrus.uml.nattable.stereotype.display;bundle-version="1.2.0"
Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
+Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.papyrus.uml.properties.constraints"
Bundle-Version: 1.2.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin

Back to the top