diff options
| author | cletavernie | 2013-03-28 15:46:22 +0000 |
|---|---|---|
| committer | cletavernie | 2013-03-28 15:46:22 +0000 |
| commit | b90db95d5aa1ea623833215b75be5412222adc01 (patch) | |
| tree | 90eed619aecf6d1fc6abdec26cbb5cee8d207444 | |
| parent | 737639568f1d3036441fb5401e72a41dcf4edf47 (diff) | |
| download | org.eclipse.papyrus-b90db95d5aa1ea623833215b75be5412222adc01.tar.gz org.eclipse.papyrus-b90db95d5aa1ea623833215b75be5412222adc01.tar.xz org.eclipse.papyrus-b90db95d5aa1ea623833215b75be5412222adc01.zip | |
404564: [Resource] Papyrus shall support optional ecore models
https://bugs.eclipse.org/bugs/show_bug.cgi?id=404564
Avoid conflicts with UnloadResourcesEditorFactory for AnyType elements (Which are also proxies)
| -rw-r--r-- | plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/editor/UnloadResourcesEditorFactory.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/editor/UnloadResourcesEditorFactory.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/editor/UnloadResourcesEditorFactory.java index 3f9a6e7f9d7..c49a7878e91 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/editor/UnloadResourcesEditorFactory.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/editor/UnloadResourcesEditorFactory.java @@ -3,6 +3,7 @@ package org.eclipse.papyrus.infra.services.resourceloading.editor; import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.xml.type.AnyType;
import org.eclipse.papyrus.infra.core.extension.diagrameditor.EditorDescriptor;
import org.eclipse.papyrus.infra.core.extension.diagrameditor.IPluggableEditorFactory;
import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
@@ -26,7 +27,9 @@ public class UnloadResourcesEditorFactory implements IPluggableEditorFactory { public boolean isPageModelFactoryFor(Object pageIdentifier) {
boolean result = false;
- if(pageIdentifier instanceof EObject) {
+ //AnyType is a Proxy, but it is already handled by another EditorFactory.
+ //Ignore it to avoid conflicts
+ if(pageIdentifier instanceof EObject && !(pageIdentifier instanceof AnyType)) {
EObject eObjectPageIdentifier = (EObject)pageIdentifier;
result = eObjectPageIdentifier.eIsProxy();
}
|