diff options
| author | ptessier | 2020-08-17 15:14:55 +0000 |
|---|---|---|
| committer | Patrick Tessier | 2020-08-19 13:10:00 +0000 |
| commit | 62f27fa7516d5a6689dd6f55b2d2bd8b3c49c2d1 (patch) | |
| tree | 288db1d81e1daa41fb5a2d956e5e8af58dfaf749 /plugins/infra/emf | |
| parent | 064f565a57c2116bff59fbb15f42512354f17518 (diff) | |
| download | org.eclipse.papyrus-62f27fa7516d5a6689dd6f55b2d2bd8b3c49c2d1.tar.gz org.eclipse.papyrus-62f27fa7516d5a6689dd6f55b2d2bd8b3c49c2d1.tar.xz org.eclipse.papyrus-62f27fa7516d5a6689dd6f55b2d2bd8b3c49c2d1.zip | |
Bug 565361: [ModelExplorer][Architecture Framework] the Architecture
Framework must allows to define the Customization to use in the
ModelExplorer
the merge is not done the computing was done at the good line.
Change-Id: I6c7f94308a064ab4dcf6a154babcf2a95828ff1d
Signed-off-by: ptessier <patrick.tessier@cea.fr>
Diffstat (limited to 'plugins/infra/emf')
| -rwxr-xr-x | plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/internal/facet/ArchitectureFrameworkCustomizationManagerUpdater.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/internal/facet/ArchitectureFrameworkCustomizationManagerUpdater.java b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/internal/facet/ArchitectureFrameworkCustomizationManagerUpdater.java index b007cd4d227..8df55149ce2 100755 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/internal/facet/ArchitectureFrameworkCustomizationManagerUpdater.java +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/internal/facet/ArchitectureFrameworkCustomizationManagerUpdater.java @@ -242,6 +242,7 @@ public class ArchitectureFrameworkCustomizationManagerUpdater extends WorskpaceC // until here, we are working with the Customization loaded in the ModelSet of the model. // we need to return the equivalent customization loaded in the ResourceSet of the CustomizationManager + final boolean isValid = merger.doValidationAndMerge(); final List<Customization> realResult = new ArrayList<>(merger.getMergedCustomizations().size()); for (final Customization tmp : merger.getMergedCustomizations()) { final Customization equivalentCusto = CUSTOMIZATION_MAP.get(tmp.getName()); @@ -250,7 +251,7 @@ public class ArchitectureFrameworkCustomizationManagerUpdater extends WorskpaceC } } - final boolean isValid = merger.doValidationAndMerge(); + if (!isValid) { StringBuilder builder = new StringBuilder(); builder.append(NLS.bind("{0} defined in the current {1} are invalid", CustomizationConfigurationPackage.eINSTANCE.getEMFFacetTreeViewerConfiguration().getName(), ArchitecturePackage.eINSTANCE.getArchitectureDescriptionLanguage().getName())); //$NON-NLS-1$ |