From 929e9738301b35cef5cc1ab00f47047671940bd5 Mon Sep 17 00:00:00 2001 From: Christian W. Damus Date: Fri, 15 Jan 2016 13:27:40 -0500 Subject: Bug 485220: [Architecture] Provide a more modular architecture https://bugs.eclipse.org/bugs/show_bug.cgi?id=485220 Move UI-dependent APIs from the org.eclipse.papyrus.infra.constraints bundle to a new org.eclipse.papyrus.infra.constraints.ui bundle. Replace usage of ISelection and IStructuredSelection in Constraint and ConstraintEngine API methods with Object and Collection, respectively. Move the ElementTypesPreferences class from the infra.elementtypesconfigurations bundle to a new infra.elementtypesconfigurations.ui bundle. For compatibility, it still persists its data via an `IMemento` in the preferences of the core `infra.elementtypesconfigurations` bundle. It implements a new provider extension interface that allows the core bundle's element-type registry to call out to it to get user-defined element types from the workspace. Move the RuntimeValuesEditionAdviceEditHelperAdvice class and some of its attendants from the infra.elementtypesconfigurations.emf bundle to the new infra.elementtypesconfigurations.ui bundle because it needs to open the EditionDialog to let the user edit objects. Likewise the similar APIs in the infra.extendedtypes bundle, including also the entire providers package for action-providers, with the ExtendedElementTypeActionService class, the IExtendedElementTypeActionProvider interface, and the corresponding extension point namespace. Move the ElementTypeValidator class from the infra.services.edit bundle to a new infra.services.edit.ui bundle. Other fixes for simple inessential UI dependencies and also conflicts in bundle classpaths (such as in the Sequence Diagram particularly) that cause deadlocks in class loading in a complete Papyrus environment, such as the AllTests suite. Factor the UI dependencies out of the infra.onefile bundle into a new infra.onefile.ui bundle. Tests all still pass (inasmuch as they do in the nightly master builds). Change-Id: I43510c84f54c3e0e52cd7d2aa3ca6aca95b894a7 --- .../org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF | 3 ++- .../properties/modelelement/CustomizationModelElement.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'plugins/customization') diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF index 64c06e09cf0..3fe33eb6a77 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF @@ -22,7 +22,8 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0", org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0", org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0" + org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0", + org.eclipse.papyrus.infra.constraints.ui;bundle-version="1.2.0" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-ClassPath: ., diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/CustomizationModelElement.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/CustomizationModelElement.java index 75fc5283a86..a2123be2da8 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/CustomizationModelElement.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/CustomizationModelElement.java @@ -31,7 +31,7 @@ import org.eclipse.papyrus.customization.properties.providers.PropertyContentPro import org.eclipse.papyrus.customization.properties.providers.PropertyEditorTypeContentProvider; import org.eclipse.papyrus.customization.properties.providers.TabContentProvider; import org.eclipse.papyrus.infra.constraints.ConstraintsPackage; -import org.eclipse.papyrus.infra.constraints.providers.ConstraintTypeContentProvider; +import org.eclipse.papyrus.infra.constraints.ui.providers.ConstraintTypeContentProvider; import org.eclipse.papyrus.infra.emf.utils.EMFHelper; import org.eclipse.papyrus.infra.ui.emf.providers.EMFGraphicalContentProvider; import org.eclipse.papyrus.infra.ui.emf.providers.strategy.ContainmentBrowseStrategy; -- cgit v1.2.3