diff options
Diffstat (limited to 'plugins/infra/editor')
3 files changed, 3 insertions, 59 deletions
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF index b31bb6ac1d6..d66d15f0e09 100644 --- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF +++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.papyrus.infra.editor.welcome.internal.constraints" -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 1.2.100.qualifier Bundle-ClassPath: . Bundle-Localization: plugin Bundle-Name: %pluginName diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/pom.xml b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/pom.xml index ec1b679a968..71d390c9897 100644 --- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/pom.xml +++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.editor.welcome</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.2.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/WelcomeModelManager.java b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/WelcomeModelManager.java index 4cf7fafb50a..4e6910dffe8 100644 --- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/WelcomeModelManager.java +++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/WelcomeModelManager.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2015 Christian W. Damus and others. + * Copyright (c) 2015, 2016 Christian W. Damus and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -38,7 +38,6 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.URIConverter; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl.ResourceLocator; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl; @@ -261,61 +260,6 @@ public class WelcomeModelManager { } } - // More or less copied from EMF - @Override - protected Resource basicGetResource(URI uri, boolean loadOnDemand) { - Map<URI, Resource> map = resourceSet.getURIResourceMap(); - if (map != null) { - Resource resource = map.get(uri); - if (resource != null) { - if (loadOnDemand && !resource.isLoaded()) { - demandLoadHelper(resource); - } - return resource; - } - } - - URIConverter theURIConverter = resourceSet.getURIConverter(); - URI normalizedURI = theURIConverter.normalize(uri); - for (Resource resource : resourceSet.getResources()) { - if (theURIConverter.normalize(resource.getURI()).equals(normalizedURI)) { - if (loadOnDemand && !resource.isLoaded()) { - demandLoadHelper(resource); - } - - if (map != null) { - map.put(uri, resource); - } - return resource; - } - } - - Resource delegatedResource = delegatedGetResource(uri, loadOnDemand); - if (delegatedResource != null) { - if (map != null) { - map.put(uri, delegatedResource); - } - return delegatedResource; - } - - if (loadOnDemand) { - Resource resource = demandCreateResource(uri); - if (resource == null) { - throw new IllegalArgumentException(String.format("Cannot create a resource for '%s'; a registered resource factory is needed", uri)); - } - - demandLoadHelper(resource); - - if (map != null) { - map.put(uri, resource); - } - return resource; - } - - return null; - - } - @Override public void dispose() { super.dispose(); |