Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2014-12-16 12:39:34 +0000
committerCamille Letavernier2014-12-17 16:55:35 +0000
commit346faafb52ab6d95a8e2de9f40154eba27e416ee (patch)
tree5092f06b73b4a6a71d23373bcb454041ee2dcae4 /plugins/uml
parente9c8fe7ab59621787ba3d7213a9578b391ab1c51 (diff)
downloadorg.eclipse.papyrus-346faafb52ab6d95a8e2de9f40154eba27e416ee.tar.gz
org.eclipse.papyrus-346faafb52ab6d95a8e2de9f40154eba27e416ee.tar.xz
org.eclipse.papyrus-346faafb52ab6d95a8e2de9f40154eba27e416ee.zip
454996: [Model Import] The Model Import should repair stereotypes
(Automatically when possible and with user confirmation otherwise) https://bugs.eclipse.org/bugs/show_bug.cgi?id=454996
Diffstat (limited to 'plugins/uml')
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF2
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/internal/participants/StereotypeApplicationRepairParticipant.java3
2 files changed, 4 insertions, 1 deletions
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF
index e4ee1ce5e85..76752117101 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Export-Package: org.eclipse.papyrus.uml.modelrepair,
org.eclipse.papyrus.uml.modelrepair.handler,
org.eclipse.papyrus.uml.modelrepair.internal.participants;x-internal:=true,
- org.eclipse.papyrus.uml.modelrepair.internal.stereotypes;x-internal:=true,
+ org.eclipse.papyrus.uml.modelrepair.internal.stereotypes;x-friends:="org.eclipse.papyrus.migration.rsa",
org.eclipse.papyrus.uml.modelrepair.internal.validation;x-internal:=true,
org.eclipse.papyrus.uml.modelrepair.service,
org.eclipse.papyrus.uml.modelrepair.ui,
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/internal/participants/StereotypeApplicationRepairParticipant.java b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/internal/participants/StereotypeApplicationRepairParticipant.java
index f0a25cb721a..7eb284007be 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/internal/participants/StereotypeApplicationRepairParticipant.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/internal/participants/StereotypeApplicationRepairParticipant.java
@@ -465,6 +465,9 @@ public class StereotypeApplicationRepairParticipant extends PackageOperations im
protected EObject resolveRef(EObject anyType, String ref) {
Resource baseResource = anyType.eResource();
+ if (baseResource == null) {
+ return null; // Already resolved & removed?
+ }
URI uri;
if (ref.contains("#")) {

Back to the top