diff options
author | Christian W. Damus | 2016-01-17 17:28:49 +0000 |
---|---|---|
committer | Christian W. Damus | 2016-01-22 15:57:12 +0000 |
commit | 652333238a0a1651c1b69a4563b72961250c5398 (patch) | |
tree | 36c503855e644803f2baeec27c47bb6d6ac56085 /plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext | |
parent | b089eab1fca586752027404cc398a173237337f8 (diff) | |
download | org.eclipse.papyrus-652333238a0a1651c1b69a4563b72961250c5398.tar.gz org.eclipse.papyrus-652333238a0a1651c1b69a4563b72961250c5398.tar.xz org.eclipse.papyrus-652333238a0a1651c1b69a4563b72961250c5398.zip |
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.emf
bundle to a new org.eclipse.papyrus.infra.ui.emf bundle. Accordingly
move tests into a new org.eclipse.papyrus.infra.ui.emf.tests bundle.
Now that we have an UI EMF bundle, move the editor-page advices from
the infra.ui bundle into it, which is a more appropriate home for them.
One UI dependency is removed by reordering of code in the
EMFHelper::getEObject(Object) API:
* the EMF Facet tree elements are once again IAdaptables, providing
their encapsulated EObjects or EReferences as adapters. So, the
case handling IAdaptable is moved ahead of the test for is-an-EObject
because these tree elements are also EObjects but are not interesting
in themselves
Also, the dialog-settings for the EMF Facet customization manager are
moved into the infra.ui.emf bundle, as is the lazy initialization of
the manager from those settings. Clients are refactored to get the
customization manager from this new bundle (via a new ProviderHelper
API) to ensure this lazy initialization.
Various UI-dependent ServiceUtilsForXyz classes that were in the
infra.emf bundle but had nothing to do with EMF are moved into the
infra.ui bundle.
UI-dependent classes from the org.eclipse.papyrus.infra.emf.readonly
bundle are moved into the org.eclipse.papyrus.infra.ui.emf, also.
These include extraction of the editor reload listener from the
ReadOnlyManager class by means of a new general-purpose
IReadOnlyManagerProcessor OSGi service interface.
Tests all still pass (inasmuch as they do in the nightly master builds).
Change-Id: Ieb0993b2ed1a7a49890d3471c7b42bc4f218fec6
Diffstat (limited to 'plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext')
3 files changed, 4 insertions, 3 deletions
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/META-INF/MANIFEST.MF b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/META-INF/MANIFEST.MF index 3702cf1009d..2499ed8ce65 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/META-INF/MANIFEST.MF @@ -18,7 +18,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.105.0", org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
org.eclipse.core.databinding;bundle-version="1.4.100",
org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0"
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/src/org/eclipse/papyrus/uml/properties/xtext/XtextLanguageEditor.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/src/org/eclipse/papyrus/uml/properties/xtext/XtextLanguageEditor.java index 4ce0fd39fc3..c823e132e75 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/src/org/eclipse/papyrus/uml/properties/xtext/XtextLanguageEditor.java +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/src/org/eclipse/papyrus/uml/properties/xtext/XtextLanguageEditor.java @@ -13,7 +13,7 @@ import org.eclipse.papyrus.extensionpoints.editors.Activator; import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration; import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.dialog.NestedEditingDialogContext; +import org.eclipse.papyrus.infra.ui.emf.dialog.NestedEditingDialogContext; import org.eclipse.papyrus.uml.properties.modelelement.UMLModelElement; import org.eclipse.papyrus.uml.properties.widgets.BodyEditor; import org.eclipse.papyrus.uml.xtext.integration.DefaultXtextDirectEditorConfiguration; diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/src/org/eclipse/papyrus/uml/properties/xtext/widget/UMLXtextReferenceValueEditor.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/src/org/eclipse/papyrus/uml/properties/xtext/widget/UMLXtextReferenceValueEditor.java index d7b69c6b1c6..9caa2f36097 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/src/org/eclipse/papyrus/uml/properties/xtext/widget/UMLXtextReferenceValueEditor.java +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/src/org/eclipse/papyrus/uml/properties/xtext/widget/UMLXtextReferenceValueEditor.java @@ -21,7 +21,7 @@ import org.eclipse.gmf.runtime.common.core.command.ICommand; import org.eclipse.gmf.runtime.common.ui.services.parser.IParser; import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter; import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper; -import org.eclipse.papyrus.infra.emf.dialog.NestedEditingDialogContext; +import org.eclipse.papyrus.infra.ui.emf.dialog.NestedEditingDialogContext; import org.eclipse.papyrus.infra.widgets.editors.StyledTextReferenceDialog; import org.eclipse.papyrus.infra.widgets.editors.StyledTextStringEditor; import org.eclipse.papyrus.infra.widgets.selectors.StringSelector; |