Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2014-02-20 19:00:41 +0000
committerCamille Letavernier2014-02-25 16:28:42 +0000
commitfd81dd0c607fc559ae939da382e2d73fcb7898d3 (patch)
treea1a976335cbf7990d82f7df8b2472a83a7b821c0 /plugins/uml/org.eclipse.papyrus.uml.import
parentfebcbd860c478bb7ea05b0087bd745a2c04fc4df (diff)
downloadorg.eclipse.papyrus-fd81dd0c607fc559ae939da382e2d73fcb7898d3.tar.gz
org.eclipse.papyrus-fd81dd0c607fc559ae939da382e2d73fcb7898d3.tar.xz
org.eclipse.papyrus-fd81dd0c607fc559ae939da382e2d73fcb7898d3.zip
366029: [Model Explorer] It is impossible to see the additionnal
resources https://bugs.eclipse.org/bugs/show_bug.cgi?id=366029 - Fix import actions to reload imported elements into the current resource set - Improve resource set contents changes detection - Improve model explorer updates
Diffstat (limited to 'plugins/uml/org.eclipse.papyrus.uml.import')
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.import/META-INF/MANIFEST.MF3
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/handlers/AbstractImportHandler.java8
2 files changed, 8 insertions, 3 deletions
diff --git a/plugins/uml/org.eclipse.papyrus.uml.import/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.import/META-INF/MANIFEST.MF
index 88814383466..77280da916b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.import/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.import/META-INF/MANIFEST.MF
@@ -12,7 +12,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",
org.eclipse.core.databinding;bundle-version="1.4.1",
org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.0.0"
+ org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.0.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.0.0.qualifier
diff --git a/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/handlers/AbstractImportHandler.java b/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/handlers/AbstractImportHandler.java
index ff05e406820..e5805d21507 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/handlers/AbstractImportHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/handlers/AbstractImportHandler.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2012 CEA LIST.
- *
+ *
* 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
@@ -12,6 +12,7 @@
package org.eclipse.papyrus.uml.importt.handlers;
import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
import org.eclipse.papyrus.views.modelexplorer.handler.AbstractCommandHandler;
import org.eclipse.uml2.common.edit.command.ChangeCommand;
import org.eclipse.uml2.uml.Package;
@@ -52,8 +53,11 @@ public abstract class AbstractImportHandler extends AbstractCommandHandler {
*/
protected void handleImportPackage(Package _package) {
PackageImport ei = UMLFactory.eINSTANCE.createPackageImport();
- ei.setImportedPackage(_package);
+
+ Package importedPackage = EMFHelper.reloadIntoContext(_package, getSelectedElement());
+
((Package)getSelectedElement()).getPackageImports().add(ei);
+ ei.setImportedPackage(importedPackage);
}
/**

Back to the top