diff options
| author | Maxime PORHEL | 2014-01-03 15:53:16 +0000 |
|---|---|---|
| committer | Maxime Porhel | 2014-02-05 14:32:09 +0000 |
| commit | fcd88555a0db42e5e9fca0b7e662891fec89a0a7 (patch) | |
| tree | 893c5d0377ac45654753e6e94a793d903ded911d | |
| parent | a70bfb3723cc076cf6e9b15661955f12b4443c5b (diff) | |
| download | org.eclipse.sirius-fcd88555a0db42e5e9fca0b7e662891fec89a0a7.tar.gz org.eclipse.sirius-fcd88555a0db42e5e9fca0b7e662891fec89a0a7.tar.xz org.eclipse.sirius-fcd88555a0db42e5e9fca0b7e662891fec89a0a7.zip | |
[423052] Do not leverage PackageNotFoundException after demandPackage
demandPackage should not return null when a namespace is declared: it
prevent migration of known (deleted) EClasses
PackageNotFoundException was thrown but we explicitly use XMLResource.OPTION_RECORD_UNKNOWN_FEATURE to record unknown features and any type. It is still possible to detect the unkown feture using XMLResource.getEObjectToExtensionMap().
Change-Id: Id21038542ad380fc6490728f82733ac787661964
Signed-off-by: Maxime PORHEL <maxime.porhel@obeo.fr>
2 files changed, 0 insertions, 30 deletions
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/RepresentationsFileExtendedMetaData.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/RepresentationsFileExtendedMetaData.java index 3c5729f9e5..77cdba8ff2 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/RepresentationsFileExtendedMetaData.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/RepresentationsFileExtendedMetaData.java @@ -64,21 +64,6 @@ public class RepresentationsFileExtendedMetaData extends BasicExtendedMetaData { return super.getType(ePackage, name); } - /** - * Does not create EPackage for unknown metamodel to have - * {@link org.eclipse.emf.ecore.xmi.PackageNotFoundException} thrown. - * - * {@inheritDoc} - */ - @Override - public EPackage demandPackage(String namespace) { - EPackage ePackage = null; - if (namespace == null) { - ePackage = super.demandPackage(namespace); - } - return ePackage; - } - @Override public EPackage getPackage(String namespace) { EPackage ePackage = RepresentationsFileMigrationService.getInstance().getPackage(namespace, version); diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/description/VSMExtendedMetaData.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/description/VSMExtendedMetaData.java index 50392135e2..941baa986f 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/description/VSMExtendedMetaData.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/description/VSMExtendedMetaData.java @@ -65,21 +65,6 @@ public class VSMExtendedMetaData extends BasicExtendedMetaData { return super.getType(ePackage, name); } - /** - * Does not create EPackage for unknown metamodel to have - * {@link org.eclipse.emf.ecore.xmi.PackageNotFoundException} thrown. - * - * {@inheritDoc} - */ - @Override - public EPackage demandPackage(String namespace) { - EPackage ePackage = null; - if (namespace == null) { - ePackage = super.demandPackage(namespace); - } - return ePackage; - } - @Override public EPackage getPackage(String namespace) { EPackage ePackage = VSMMigrationService.getInstance().getPackage(namespace, version); |
