Merge branch 'master' into master-juno
diff --git a/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/src/org/eclipse/gendoc/bundle/acceleo/papyrus/service/PapyrusModelLoaderService.java b/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/src/org/eclipse/gendoc/bundle/acceleo/papyrus/service/PapyrusModelLoaderService.java
index d8f2a1b..5cffa0f 100644
--- a/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/src/org/eclipse/gendoc/bundle/acceleo/papyrus/service/PapyrusModelLoaderService.java
+++ b/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/src/org/eclipse/gendoc/bundle/acceleo/papyrus/service/PapyrusModelLoaderService.java
@@ -32,12 +32,12 @@
import org.eclipse.papyrus.infra.core.resource.ModelIdentifiers;
import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.notation.NotationModel;
import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel;
+import org.eclipse.papyrus.infra.core.resource.uml.UmlModel;
import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry;
import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
-import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;
-import org.eclipse.papyrus.uml.tools.model.UmlModel;
/**
@@ -145,25 +145,19 @@
ServicesRegistry servicesRegistry = new ExtensionServicesRegistry(
Activator.PLUGIN_ID);
try{
+ String uriStr = modelUri.toString();
+ int index = uriStr.lastIndexOf('.');
+ uriStr = uriStr.substring(0, index);
servicesRegistry.startServices(Collections.singletonList(ModelSet.class
.getName()));
modelSet = servicesRegistry.getService(ModelSet.class);
if (modelSet != null && modelUri != null) {
- // load models
- modelSet.loadModels(modelUri);
+ modelSet.getResource(URI.createURI(uriStr+".notation"), true);
+ modelSet.getResource(URI.createURI(uriStr+".uml"), true);
}
// start remaining services
servicesRegistry.startRegistry();
- } catch (ModelMultiException e) {
- try {
- // with the ModelMultiException it is still possible to open the
- // editors that's why the service registry is still started
- servicesRegistry.startRegistry();
-
- } catch (ServiceException e1) {
- //Do nothing
- }
} catch (ServiceException e) {
//Do nothing
}
