From 90c9b9830e0d837ce176dd8c673adf75ef262b72 Mon Sep 17 00:00:00 2001 From: Christian W. Damus Date: Thu, 21 Jan 2016 16:43:53 -0500 Subject: Bug 485220: [Architecture] Provide a more modular architecture (& builds) for Papyrus https://bugs.eclipse.org/bugs/show_bug.cgi?id=485220 Refactor the Properties Model bundles into the Infra Layer. The *.views.properties.model[.edit,.editor] bundles are renamed as *.infra.properties[.edit,.editor]. The packages within are correspondingly renamed. To support upgrade installation, special p2 update metadata tells the p2 engine how these bundles have been renamed, ensuring proper replacement of the old *.views.properties.model* bundles, because otherwise the clash of EMF model registrations would cause run-time errors. The *.views.properties.environment extension point is moved to *.infra.properties.environments. The *.views.properties.context extension point has the element moved to a new *.infra.properties.contexts point. The element remains. JUnit tests pass, at least inasmuch as they pass in the nightly builds. Change-Id: I6445808f8eb1144b08c0cd5f0a487d1bad229a4c --- .../plugin.xml | 2 +- .../plugin.xml | 2 +- .../plugin.xml | 2 +- .../META-INF/MANIFEST.MF | 4 +-- .../model/LayoutEuristic.ecore | 14 +++++----- .../generators/AbstractQVTGenerator.java | 2 +- .../generation/generators/EcoreGenerator.java | 4 +-- .../generators/EditContextGenerator.java | 8 +++--- .../generation/generators/IGenerator.java | 6 ++-- .../generation/generators/ProfileGenerator.java | 6 ++-- .../generation/layout/ILayoutGenerator.java | 6 ++-- .../generation/layout/ProfileWithDatatypes.java | 32 +++++++++++----------- .../generation/layout/StandardLayoutGenerator.java | 26 +++++++++--------- .../DataContextPropertiesContentProvider.java | 2 +- .../DataContextPropertiesLabelProvider.java | 2 +- .../generation/wizard/CreateContextWizard.java | 20 +++++++------- .../generation/wizard/SelectFieldsPage.java | 10 +++---- .../META-INF/MANIFEST.MF | 2 +- .../properties/model/xwt/resource/XWTResource.java | 6 ++-- .../META-INF/MANIFEST.MF | 2 +- .../plugin.xml | 6 ++-- .../editor/ContextEditorActionBarContributor.java | 8 +++--- .../customization/properties/editor/UIEditor.java | 4 +-- .../properties/editor/ViewFilter.java | 6 ++-- .../editor/actions/CreateSectionAction.java | 16 +++++------ .../editor/actions/CreateSectionWidgetAction.java | 12 ++++---- .../properties/editor/preview/Preview.java | 6 ++-- .../modelelement/CustomizationModelElement.java | 12 ++++---- .../CustomizationModelElementFactory.java | 2 +- .../modelelement/GenericAttributeModelElement.java | 2 +- .../GenericAttributeModelElementFactory.java | 8 +++--- .../GenericPropertyModelElementFactory.java | 2 +- .../modelelement/SectionNameObservableValue.java | 4 +-- .../AbstractContextualContentProvider.java | 2 +- .../ConstraintDescriptorContentProvider.java | 8 +++--- .../providers/ContextContentProvider.java | 2 +- .../DataContextElementContentProvider.java | 8 +++--- .../providers/DependencyContentProvider.java | 2 +- .../providers/EnvironmentContentProvider.java | 2 +- .../providers/PropertyContentProvider.java | 8 +++--- .../PropertyEditorTypeContentProvider.java | 4 +-- .../properties/providers/TabContentProvider.java | 4 +-- .../properties/query/DataContextsImageQuery.java | 2 +- .../properties/query/GetVisibleFeaturesQuery.java | 8 +++--- .../properties/query/ShowContextQuery.java | 2 +- .../properties/query/ViewsImageQuery.java | 2 +- .../actions/ContextStorageActionRegistry.java | 2 +- .../storage/actions/ContextStorageActionUtil.java | 4 +-- .../storage/actions/IContextCopyAction.java | 2 +- .../storage/actions/IContextDeleteAction.java | 2 +- .../storage/actions/IContextEditAction.java | 2 +- .../actions/IContextStorageActionProvider.java | 2 +- .../workspace/WorkspaceContextCopyAction.java | 8 +++--- .../workspace/WorkspaceContextDeleteAction.java | 2 +- .../workspace/WorkspaceContextEditAction.java | 2 +- .../WorkspaceContextStorageActionProvider.java | 2 +- .../properties/ui/CopyContextAction.java | 2 +- .../properties/ui/CustomizationDialog.java | 2 +- .../properties/ui/EditContextAction.java | 2 +- .../properties/ui/RemoveContextAction.java | 2 +- .../customization/properties/util/ProjectUtil.java | 4 +-- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.papyrus.customization/plugin.xml | 4 +-- .../PropertyViewEnvironmentExtensionFactory.java | 2 +- .../factory/PropertyViewExtensionFactory.java | 2 +- .../CustomizationModelElementFactory.java | 2 +- 66 files changed, 176 insertions(+), 176 deletions(-) (limited to 'plugins/customization') diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/plugin.xml b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/plugin.xml index a8eee9da1de..75d436a809b 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/plugin.xml +++ b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/plugin.xml @@ -1,6 +1,6 @@ - + diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/plugin.xml b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/plugin.xml index 1ece3e760fc..8acf0985ec7 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/plugin.xml +++ b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/plugin.xml @@ -1,6 +1,6 @@ - + diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/plugin.xml b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/plugin.xml index 1a36541c6c7..becca600957 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/plugin.xml +++ b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/plugin.xml @@ -1,6 +1,6 @@ - + diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF index 8a736422f41..c0d8e21fed1 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF +++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF @@ -7,11 +7,11 @@ Export-Package: org.eclipse.papyrus.customization.properties.generation, Require-Bundle: org.eclipse.ui;bundle-version="3.6.1", org.eclipse.osgi;bundle-version="3.6.1", org.eclipse.core.runtime;bundle-version="3.6.0", - org.eclipse.papyrus.views.properties.model;bundle-version="1.2.0", + org.eclipse.papyrus.infra.properties;bundle-version="1.2.0", org.eclipse.m2m.qvt.oml;bundle-version="3.0.1", org.eclipse.m2m.qvt.oml.common;bundle-version="2.1.0", org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.views.properties.model.edit;bundle-version="1.2.0", + org.eclipse.papyrus.infra.properties.edit;bundle-version="1.2.0", org.eclipse.emf.common.ui;bundle-version="2.6.0", org.eclipse.core.resources;bundle-version="3.6.0", org.eclipse.uml2.uml;bundle-version="3.1.1", diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/model/LayoutEuristic.ecore b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/model/LayoutEuristic.ecore index 3aef013fa8c..e693c82623c 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/model/LayoutEuristic.ecore +++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/model/LayoutEuristic.ecore @@ -5,15 +5,15 @@ nsURI="http://www.eclipse.org/papyrus/properties/layoutEuristic" nsPrefix="layout"> - - - - + + + + - + eType="ecore:EClass platform:/plugin/org.eclipse.papyrus.infra.properties/Model/Properties.ecore#//environment/PropertyEditorType"/> + + eType="ecore:EClass platform:/plugin/org.eclipse.papyrus.infra.properties/Model/Properties.ecore#//environment/ModelElementFactoryDescriptor"/> diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/AbstractQVTGenerator.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/AbstractQVTGenerator.java index 1adfbbb1bd0..7e664840de4 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/AbstractQVTGenerator.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/AbstractQVTGenerator.java @@ -38,7 +38,7 @@ import org.eclipse.m2m.qvt.oml.ModelExtent; import org.eclipse.m2m.qvt.oml.TransformationExecutor; import org.eclipse.papyrus.customization.properties.generation.Activator; import org.eclipse.papyrus.infra.emf.utils.EMFHelper; -import org.eclipse.papyrus.views.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.Context; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/EcoreGenerator.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/EcoreGenerator.java index e0a44895752..c9d1b229e7a 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/EcoreGenerator.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/EcoreGenerator.java @@ -39,8 +39,8 @@ import org.eclipse.m2m.qvt.oml.ModelExtent; import org.eclipse.papyrus.customization.properties.generation.Activator; import org.eclipse.papyrus.customization.properties.generation.messages.Messages; import org.eclipse.papyrus.customization.properties.generation.wizard.widget.FileChooser; -import org.eclipse.papyrus.views.properties.contexts.DataContextElement; -import org.eclipse.papyrus.views.properties.contexts.Property; +import org.eclipse.papyrus.infra.properties.contexts.DataContextElement; +import org.eclipse.papyrus.infra.properties.contexts.Property; import org.eclipse.papyrus.views.properties.root.PropertiesRoot; import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager; import org.eclipse.swt.SWT; diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/EditContextGenerator.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/EditContextGenerator.java index 52e9a1047f3..7c23a341749 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/EditContextGenerator.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/EditContextGenerator.java @@ -20,10 +20,10 @@ import java.util.List; import org.eclipse.core.databinding.observable.value.IObservableValue; import org.eclipse.emf.common.util.URI; import org.eclipse.papyrus.customization.properties.generation.messages.Messages; -import org.eclipse.papyrus.views.properties.contexts.Context; -import org.eclipse.papyrus.views.properties.contexts.DataContextElement; -import org.eclipse.papyrus.views.properties.contexts.Property; -import org.eclipse.papyrus.views.properties.contexts.View; +import org.eclipse.papyrus.infra.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.DataContextElement; +import org.eclipse.papyrus.infra.properties.contexts.Property; +import org.eclipse.papyrus.infra.properties.contexts.View; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Listener; diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/IGenerator.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/IGenerator.java index 5d71b90e995..683ab418956 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/IGenerator.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/IGenerator.java @@ -18,9 +18,9 @@ import java.util.List; import org.eclipse.core.databinding.observable.value.IObservableValue; import org.eclipse.emf.common.util.URI; -import org.eclipse.papyrus.views.properties.contexts.Context; -import org.eclipse.papyrus.views.properties.contexts.DataContextElement; -import org.eclipse.papyrus.views.properties.contexts.Property; +import org.eclipse.papyrus.infra.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.DataContextElement; +import org.eclipse.papyrus.infra.properties.contexts.Property; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Listener; diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/ProfileGenerator.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/ProfileGenerator.java index 736253e9af7..92066951805 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/ProfileGenerator.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/ProfileGenerator.java @@ -31,9 +31,9 @@ import org.eclipse.m2m.qvt.oml.ModelExtent; import org.eclipse.papyrus.customization.properties.generation.Activator; import org.eclipse.papyrus.customization.properties.generation.messages.Messages; import org.eclipse.papyrus.customization.properties.generation.wizard.widget.FileChooser; -import org.eclipse.papyrus.views.properties.contexts.Context; -import org.eclipse.papyrus.views.properties.contexts.DataContextElement; -import org.eclipse.papyrus.views.properties.contexts.Property; +import org.eclipse.papyrus.infra.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.DataContextElement; +import org.eclipse.papyrus.infra.properties.contexts.Property; import org.eclipse.papyrus.views.properties.root.PropertiesRoot; import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager; import org.eclipse.swt.SWT; diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/ILayoutGenerator.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/ILayoutGenerator.java index 3868477323e..b20c6034afc 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/ILayoutGenerator.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/ILayoutGenerator.java @@ -14,9 +14,9 @@ package org.eclipse.papyrus.customization.properties.generation.layout; import java.util.List; import org.eclipse.papyrus.customization.properties.generation.generators.IGenerator; -import org.eclipse.papyrus.views.properties.contexts.Section; -import org.eclipse.papyrus.views.properties.contexts.View; -import org.eclipse.papyrus.views.properties.ui.PropertyEditor; +import org.eclipse.papyrus.infra.properties.contexts.Section; +import org.eclipse.papyrus.infra.properties.contexts.View; +import org.eclipse.papyrus.infra.properties.ui.PropertyEditor; /** * An interface for defining Layout generators. diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/ProfileWithDatatypes.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/ProfileWithDatatypes.java index 7e9a5a42f40..cf236ea2259 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/ProfileWithDatatypes.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/ProfileWithDatatypes.java @@ -16,23 +16,23 @@ import java.util.List; import org.eclipse.papyrus.customization.properties.generation.Activator; import org.eclipse.papyrus.customization.properties.generation.generators.IGenerator; import org.eclipse.papyrus.customization.properties.generation.generators.ProfileGenerator; -import org.eclipse.papyrus.views.properties.contexts.Context; -import org.eclipse.papyrus.views.properties.contexts.DataContextElement; -import org.eclipse.papyrus.views.properties.contexts.DataContextPackage; -import org.eclipse.papyrus.views.properties.contexts.DataContextRoot; -import org.eclipse.papyrus.views.properties.contexts.Property; -import org.eclipse.papyrus.views.properties.contexts.View; -import org.eclipse.papyrus.views.properties.environment.CompositeWidgetType; -import org.eclipse.papyrus.views.properties.environment.Environment; -import org.eclipse.papyrus.views.properties.environment.LayoutType; -import org.eclipse.papyrus.views.properties.environment.PropertyEditorType; -import org.eclipse.papyrus.views.properties.environment.Type; +import org.eclipse.papyrus.infra.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.DataContextElement; +import org.eclipse.papyrus.infra.properties.contexts.DataContextPackage; +import org.eclipse.papyrus.infra.properties.contexts.DataContextRoot; +import org.eclipse.papyrus.infra.properties.contexts.Property; +import org.eclipse.papyrus.infra.properties.contexts.View; +import org.eclipse.papyrus.infra.properties.environment.CompositeWidgetType; +import org.eclipse.papyrus.infra.properties.environment.Environment; +import org.eclipse.papyrus.infra.properties.environment.LayoutType; +import org.eclipse.papyrus.infra.properties.environment.PropertyEditorType; +import org.eclipse.papyrus.infra.properties.environment.Type; +import org.eclipse.papyrus.infra.properties.ui.CompositeWidget; +import org.eclipse.papyrus.infra.properties.ui.Layout; +import org.eclipse.papyrus.infra.properties.ui.PropertyEditor; +import org.eclipse.papyrus.infra.properties.ui.UiFactory; +import org.eclipse.papyrus.infra.properties.ui.ValueAttribute; import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager; -import org.eclipse.papyrus.views.properties.ui.CompositeWidget; -import org.eclipse.papyrus.views.properties.ui.Layout; -import org.eclipse.papyrus.views.properties.ui.PropertyEditor; -import org.eclipse.papyrus.views.properties.ui.UiFactory; -import org.eclipse.papyrus.views.properties.ui.ValueAttribute; import org.eclipse.papyrus.views.properties.util.PropertiesUtil; import org.eclipse.uml2.uml.Package; import org.eclipse.uml2.uml.UMLPackage; diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/StandardLayoutGenerator.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/StandardLayoutGenerator.java index 225a0f40ae5..0eac05ca8e8 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/StandardLayoutGenerator.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/StandardLayoutGenerator.java @@ -25,20 +25,20 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.papyrus.customization.properties.generation.Activator; import org.eclipse.papyrus.customization.properties.generation.generators.IGenerator; import org.eclipse.papyrus.customization.properties.generation.messages.Messages; -import org.eclipse.papyrus.views.properties.contexts.ContextsFactory; -import org.eclipse.papyrus.views.properties.contexts.Property; -import org.eclipse.papyrus.views.properties.contexts.Section; -import org.eclipse.papyrus.views.properties.contexts.View; -import org.eclipse.papyrus.views.properties.environment.CompositeWidgetType; -import org.eclipse.papyrus.views.properties.environment.LayoutType; -import org.eclipse.papyrus.views.properties.environment.Namespace; -import org.eclipse.papyrus.views.properties.environment.Type; +import org.eclipse.papyrus.infra.properties.contexts.ContextsFactory; +import org.eclipse.papyrus.infra.properties.contexts.Property; +import org.eclipse.papyrus.infra.properties.contexts.Section; +import org.eclipse.papyrus.infra.properties.contexts.View; +import org.eclipse.papyrus.infra.properties.environment.CompositeWidgetType; +import org.eclipse.papyrus.infra.properties.environment.LayoutType; +import org.eclipse.papyrus.infra.properties.environment.Namespace; +import org.eclipse.papyrus.infra.properties.environment.Type; +import org.eclipse.papyrus.infra.properties.ui.CompositeWidget; +import org.eclipse.papyrus.infra.properties.ui.Layout; +import org.eclipse.papyrus.infra.properties.ui.PropertyEditor; +import org.eclipse.papyrus.infra.properties.ui.UiFactory; +import org.eclipse.papyrus.infra.properties.ui.ValueAttribute; import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager; -import org.eclipse.papyrus.views.properties.ui.CompositeWidget; -import org.eclipse.papyrus.views.properties.ui.Layout; -import org.eclipse.papyrus.views.properties.ui.PropertyEditor; -import org.eclipse.papyrus.views.properties.ui.UiFactory; -import org.eclipse.papyrus.views.properties.ui.ValueAttribute; import org.eclipse.papyrus.views.properties.util.PropertiesUtil; /** diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/providers/DataContextPropertiesContentProvider.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/providers/DataContextPropertiesContentProvider.java index 4a5a3b35626..fb0de1742e3 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/providers/DataContextPropertiesContentProvider.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/providers/DataContextPropertiesContentProvider.java @@ -14,7 +14,7 @@ package org.eclipse.papyrus.customization.properties.generation.providers; import java.util.List; import org.eclipse.papyrus.customization.properties.providers.PropertyContentProvider; -import org.eclipse.papyrus.views.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.Context; public class DataContextPropertiesContentProvider extends PropertyContentProvider { diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/providers/DataContextPropertiesLabelProvider.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/providers/DataContextPropertiesLabelProvider.java index 1ea93fa026c..db9154adf96 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/providers/DataContextPropertiesLabelProvider.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/providers/DataContextPropertiesLabelProvider.java @@ -20,7 +20,7 @@ import org.eclipse.jface.viewers.ViewerCell; import org.eclipse.papyrus.customization.properties.generation.wizard.SelectFieldsPage; import org.eclipse.papyrus.customization.properties.providers.ContextLabelProvider; import org.eclipse.papyrus.infra.emf.utils.EMFHelper; -import org.eclipse.papyrus.views.properties.contexts.Property; +import org.eclipse.papyrus.infra.properties.contexts.Property; import org.eclipse.swt.graphics.Image; public class DataContextPropertiesLabelProvider extends StyledCellLabelProvider { diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/CreateContextWizard.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/CreateContextWizard.java index bbb75165918..061fa453c94 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/CreateContextWizard.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/CreateContextWizard.java @@ -37,17 +37,17 @@ import org.eclipse.papyrus.customization.properties.generation.generators.IGener import org.eclipse.papyrus.customization.properties.generation.layout.ILayoutGenerator; import org.eclipse.papyrus.customization.properties.generation.messages.Messages; import org.eclipse.papyrus.customization.properties.generation.wizard.widget.TernaryButton; -import org.eclipse.papyrus.views.properties.contexts.Context; -import org.eclipse.papyrus.views.properties.contexts.ContextsFactory; -import org.eclipse.papyrus.views.properties.contexts.DataContextElement; -import org.eclipse.papyrus.views.properties.contexts.Property; -import org.eclipse.papyrus.views.properties.contexts.Section; -import org.eclipse.papyrus.views.properties.contexts.Tab; -import org.eclipse.papyrus.views.properties.contexts.View; +import org.eclipse.papyrus.infra.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.ContextsFactory; +import org.eclipse.papyrus.infra.properties.contexts.DataContextElement; +import org.eclipse.papyrus.infra.properties.contexts.Property; +import org.eclipse.papyrus.infra.properties.contexts.Section; +import org.eclipse.papyrus.infra.properties.contexts.Tab; +import org.eclipse.papyrus.infra.properties.contexts.View; +import org.eclipse.papyrus.infra.properties.ui.PropertyEditor; +import org.eclipse.papyrus.infra.properties.ui.UiFactory; +import org.eclipse.papyrus.infra.properties.ui.ValueAttribute; import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager; -import org.eclipse.papyrus.views.properties.ui.PropertyEditor; -import org.eclipse.papyrus.views.properties.ui.UiFactory; -import org.eclipse.papyrus.views.properties.ui.ValueAttribute; import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/SelectFieldsPage.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/SelectFieldsPage.java index 5c8d2bf814f..631eacbb11c 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/SelectFieldsPage.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/SelectFieldsPage.java @@ -32,11 +32,11 @@ import org.eclipse.papyrus.customization.properties.generation.providers.DataCon import org.eclipse.papyrus.customization.properties.generation.providers.DataContextPropertiesLabelProvider; import org.eclipse.papyrus.customization.properties.generation.wizard.widget.TernaryButton; import org.eclipse.papyrus.infra.emf.utils.EMFHelper; -import org.eclipse.papyrus.views.properties.contexts.Context; -import org.eclipse.papyrus.views.properties.contexts.DataContextElement; -import org.eclipse.papyrus.views.properties.contexts.DataContextPackage; -import org.eclipse.papyrus.views.properties.contexts.DataContextRoot; -import org.eclipse.papyrus.views.properties.contexts.Property; +import org.eclipse.papyrus.infra.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.DataContextElement; +import org.eclipse.papyrus.infra.properties.contexts.DataContextPackage; +import org.eclipse.papyrus.infra.properties.contexts.DataContextRoot; +import org.eclipse.papyrus.infra.properties.contexts.Property; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.TreeEditor; import org.eclipse.swt.layout.GridData; diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/META-INF/MANIFEST.MF index fa8a4cce5c8..1299b08a90f 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/META-INF/MANIFEST.MF +++ b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.emf.ecore, org.eclipse.m2m.qvt.oml;bundle-version="3.1.0", org.eclipse.papyrus.views.properties;bundle-version="1.2.0", - org.eclipse.papyrus.views.properties.model;bundle-version="1.2.0", + org.eclipse.papyrus.infra.properties;bundle-version="1.2.0", org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", org.eclipse.wst.xml.core;bundle-version="1.1.0", org.eclipse.core.resources;bundle-version="3.7.0", diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/resource/XWTResource.java b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/resource/XWTResource.java index 9649bb201af..1133cea8470 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/resource/XWTResource.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/resource/XWTResource.java @@ -45,10 +45,10 @@ import org.eclipse.papyrus.customization.properties.model.xwt.Activator; import org.eclipse.papyrus.customization.properties.model.xwt.format.XMLFormatter; import org.eclipse.papyrus.customization.properties.model.xwt.modisco.GenericXMLResourceImpl; import org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.Root; -import org.eclipse.papyrus.views.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.ui.CompositeWidget; +import org.eclipse.papyrus.infra.properties.ui.UiPackage; import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager; -import org.eclipse.papyrus.views.properties.ui.CompositeWidget; -import org.eclipse.papyrus.views.properties.ui.UiPackage; import org.eclipse.papyrus.views.properties.util.PropertiesUtil; /** 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 3fe33eb6a77..357df2e8e0e 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 @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0", org.eclipse.papyrus.views.properties;bundle-version="1.2.0", - org.eclipse.papyrus.views.properties.model;bundle-version="1.2.0", + org.eclipse.papyrus.infra.properties;bundle-version="1.2.0", org.eclipse.papyrus.customization.properties.model.xwt;bundle-version="1.2.0", org.eclipse.emf.ecore.editor;bundle-version="2.6.0", org.eclipse.emf.databinding;bundle-version="1.2.0", diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/plugin.xml b/plugins/customization/org.eclipse.papyrus.customization.properties/plugin.xml index c25beb98335..a162baa673b 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/plugin.xml +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/plugin.xml @@ -25,18 +25,18 @@ - + - + - + diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/ContextEditorActionBarContributor.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/ContextEditorActionBarContributor.java index e692ac63d2f..e2545db2352 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/ContextEditorActionBarContributor.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/ContextEditorActionBarContributor.java @@ -36,10 +36,10 @@ import org.eclipse.papyrus.customization.properties.editor.actions.MoDiscoPasteA import org.eclipse.papyrus.customization.properties.editor.actions.ToggleDataContextAction; import org.eclipse.papyrus.customization.properties.editor.actions.ValidationAction; import org.eclipse.papyrus.customization.properties.util.ActionUtil; -import org.eclipse.papyrus.views.properties.contexts.Context; -import org.eclipse.papyrus.views.properties.contexts.Section; -import org.eclipse.papyrus.views.properties.contexts.Tab; -import org.eclipse.papyrus.views.properties.contexts.View; +import org.eclipse.papyrus.infra.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.Section; +import org.eclipse.papyrus.infra.properties.contexts.Tab; +import org.eclipse.papyrus.infra.properties.contexts.View; /** * The Action bar contributor for the Context Editor diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/UIEditor.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/UIEditor.java index 8edf2aba116..9eff15de6c8 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/UIEditor.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/UIEditor.java @@ -60,11 +60,11 @@ import org.eclipse.papyrus.customization.properties.editor.preview.Preview; import org.eclipse.papyrus.customization.properties.messages.Messages; import org.eclipse.papyrus.customization.properties.providers.ContextContentProvider; import org.eclipse.papyrus.customization.properties.providers.ContextLabelProvider; +import org.eclipse.papyrus.infra.properties.catalog.PropertiesURIHandler; +import org.eclipse.papyrus.infra.properties.contexts.Context; import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor; import org.eclipse.papyrus.infra.widgets.editors.ICommitListener; import org.eclipse.papyrus.infra.widgets.editors.StringEditor; -import org.eclipse.papyrus.views.properties.catalog.PropertiesURIHandler; -import org.eclipse.papyrus.views.properties.contexts.Context; import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager; import org.eclipse.papyrus.views.properties.widgets.layout.GridData; import org.eclipse.papyrus.views.properties.widgets.layout.PropertiesLayout; diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/ViewFilter.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/ViewFilter.java index d97955f1ae6..7a882562c3a 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/ViewFilter.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/ViewFilter.java @@ -15,9 +15,9 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.papyrus.infra.emf.utils.EMFHelper; -import org.eclipse.papyrus.views.properties.contexts.DataContextElement; -import org.eclipse.papyrus.views.properties.contexts.DataContextPackage; -import org.eclipse.papyrus.views.properties.contexts.View; +import org.eclipse.papyrus.infra.properties.contexts.DataContextElement; +import org.eclipse.papyrus.infra.properties.contexts.DataContextPackage; +import org.eclipse.papyrus.infra.properties.contexts.View; import org.eclipse.ui.internal.misc.StringMatcher; /** diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/CreateSectionAction.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/CreateSectionAction.java index b1999aadfde..477987be578 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/CreateSectionAction.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/CreateSectionAction.java @@ -29,15 +29,15 @@ import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.emf.edit.ui.action.StaticSelectionCommandAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.papyrus.views.properties.contexts.Context; -import org.eclipse.papyrus.views.properties.contexts.ContextsFactory; -import org.eclipse.papyrus.views.properties.contexts.Section; -import org.eclipse.papyrus.views.properties.contexts.View; +import org.eclipse.papyrus.infra.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.ContextsFactory; +import org.eclipse.papyrus.infra.properties.contexts.Section; +import org.eclipse.papyrus.infra.properties.contexts.View; +import org.eclipse.papyrus.infra.properties.ui.CompositeWidget; +import org.eclipse.papyrus.infra.properties.ui.Layout; +import org.eclipse.papyrus.infra.properties.ui.UiFactory; +import org.eclipse.papyrus.infra.properties.ui.ValueAttribute; import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager; -import org.eclipse.papyrus.views.properties.ui.CompositeWidget; -import org.eclipse.papyrus.views.properties.ui.Layout; -import org.eclipse.papyrus.views.properties.ui.UiFactory; -import org.eclipse.papyrus.views.properties.ui.ValueAttribute; /** * A Command for create a {@link Section} in the given View. diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/CreateSectionWidgetAction.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/CreateSectionWidgetAction.java index b20e5fb063c..c9298ecf91f 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/CreateSectionWidgetAction.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/CreateSectionWidgetAction.java @@ -23,13 +23,13 @@ import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.emf.edit.ui.action.StaticSelectionCommandAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.papyrus.infra.properties.contexts.Section; +import org.eclipse.papyrus.infra.properties.ui.CompositeWidget; +import org.eclipse.papyrus.infra.properties.ui.Layout; +import org.eclipse.papyrus.infra.properties.ui.UiFactory; +import org.eclipse.papyrus.infra.properties.ui.ValueAttribute; import org.eclipse.papyrus.infra.widgets.Activator; -import org.eclipse.papyrus.views.properties.contexts.Section; import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager; -import org.eclipse.papyrus.views.properties.ui.CompositeWidget; -import org.eclipse.papyrus.views.properties.ui.Layout; -import org.eclipse.papyrus.views.properties.ui.UiFactory; -import org.eclipse.papyrus.views.properties.ui.ValueAttribute; /** * An Action to create a section's XWT Resource, with a default Composite @@ -69,7 +69,7 @@ public class CreateSectionWidgetAction extends StaticSelectionCommandAction { CompositeWidget newWidget = createWidget(); CompoundCommandActionDelegate createActionCommand = new CompoundCommandActionDelegate(); - createActionCommand.setImage(Activator.getDefault().getImage("org.eclipse.papyrus.views.properties.model.edit", "icons/full/obj16/CompositeWidget.gif")); //$NON-NLS-1$//$NON-NLS-2$ + createActionCommand.setImage(Activator.getDefault().getImage("org.eclipse.papyrus.infra.properties.edit", "icons/full/obj16/CompositeWidget.gif")); //$NON-NLS-1$//$NON-NLS-2$ createActionCommand.append(getCreateResourceCommand(newWidget)); createActionCommand.append(getSetWidgetCommand(newWidget)); diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/preview/Preview.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/preview/Preview.java index 09b27ecd5b5..c4f230ad148 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/preview/Preview.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/preview/Preview.java @@ -41,9 +41,9 @@ import org.eclipse.papyrus.customization.properties.messages.Messages; import org.eclipse.papyrus.customization.properties.model.xwt.resource.XWTResource; import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.TreeElement; import org.eclipse.papyrus.infra.emf.utils.EMFHelper; -import org.eclipse.papyrus.views.properties.contexts.Section; -import org.eclipse.papyrus.views.properties.contexts.Tab; -import org.eclipse.papyrus.views.properties.contexts.View; +import org.eclipse.papyrus.infra.properties.contexts.Section; +import org.eclipse.papyrus.infra.properties.contexts.Tab; +import org.eclipse.papyrus.infra.properties.contexts.View; import org.eclipse.papyrus.views.properties.runtime.DefaultDisplayEngine; import org.eclipse.papyrus.views.properties.runtime.DisplayEngine; import org.eclipse.papyrus.views.properties.widgets.layout.PropertiesLayout; 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 a2123be2da8..b98fb62cc23 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 @@ -33,6 +33,12 @@ import org.eclipse.papyrus.customization.properties.providers.TabContentProvider import org.eclipse.papyrus.infra.constraints.ConstraintsPackage; import org.eclipse.papyrus.infra.constraints.ui.providers.ConstraintTypeContentProvider; import org.eclipse.papyrus.infra.emf.utils.EMFHelper; +import org.eclipse.papyrus.infra.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.ContextsPackage; +import org.eclipse.papyrus.infra.properties.contexts.DataContextElement; +import org.eclipse.papyrus.infra.properties.contexts.Section; +import org.eclipse.papyrus.infra.properties.environment.EnvironmentPackage; +import org.eclipse.papyrus.infra.properties.ui.PropertyEditor; import org.eclipse.papyrus.infra.ui.emf.providers.EMFGraphicalContentProvider; import org.eclipse.papyrus.infra.ui.emf.providers.strategy.ContainmentBrowseStrategy; import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory; @@ -42,16 +48,10 @@ import org.eclipse.papyrus.infra.widgets.strategy.IStrategyBasedContentProvider; import org.eclipse.papyrus.infra.widgets.strategy.ProviderBasedBrowseStrategy; import org.eclipse.papyrus.infra.widgets.strategy.StrategyBasedContentProvider; import org.eclipse.papyrus.infra.widgets.strategy.TreeBrowseStrategy; -import org.eclipse.papyrus.views.properties.contexts.Context; -import org.eclipse.papyrus.views.properties.contexts.ContextsPackage; -import org.eclipse.papyrus.views.properties.contexts.DataContextElement; -import org.eclipse.papyrus.views.properties.contexts.Section; -import org.eclipse.papyrus.views.properties.environment.EnvironmentPackage; import org.eclipse.papyrus.views.properties.modelelement.AbstractModelElement; import org.eclipse.papyrus.views.properties.modelelement.DataSource; import org.eclipse.papyrus.views.properties.modelelement.EMFModelElement; import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager; -import org.eclipse.papyrus.views.properties.ui.PropertyEditor; /** * A {@link ModelElement} for customization specific properties diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/CustomizationModelElementFactory.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/CustomizationModelElementFactory.java index 176f3a6805a..d35133e7505 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/CustomizationModelElementFactory.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/CustomizationModelElementFactory.java @@ -15,7 +15,7 @@ package org.eclipse.papyrus.customization.properties.modelelement; import org.eclipse.emf.ecore.EObject; import org.eclipse.papyrus.infra.emf.utils.EMFHelper; -import org.eclipse.papyrus.views.properties.contexts.DataContextElement; +import org.eclipse.papyrus.infra.properties.contexts.DataContextElement; import org.eclipse.papyrus.views.properties.modelelement.AbstractEMFModelElementFactory; import org.eclipse.papyrus.views.properties.modelelement.AbstractModelElementFactory; import org.eclipse.papyrus.views.properties.modelelement.EMFModelElement; diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/GenericAttributeModelElement.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/GenericAttributeModelElement.java index d38e3c5be0d..97a49311ad8 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/GenericAttributeModelElement.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/GenericAttributeModelElement.java @@ -29,11 +29,11 @@ import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.papyrus.infra.constraints.ConfigProperty; import org.eclipse.papyrus.infra.core.services.ServiceException; import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource; +import org.eclipse.papyrus.infra.properties.ui.WidgetAttribute; import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService; import org.eclipse.papyrus.infra.widgets.providers.AbstractStaticContentProvider; import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider; import org.eclipse.papyrus.views.properties.modelelement.AbstractModelElement; -import org.eclipse.papyrus.views.properties.ui.WidgetAttribute; /** * XWT relies a lot on reflectivity, as it is based on an XML syntax. diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/GenericAttributeModelElementFactory.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/GenericAttributeModelElementFactory.java index 7efa8feaa66..f93116da2ce 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/GenericAttributeModelElementFactory.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/GenericAttributeModelElementFactory.java @@ -20,11 +20,11 @@ import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.papyrus.customization.properties.Activator; import org.eclipse.papyrus.infra.emf.utils.EMFHelper; -import org.eclipse.papyrus.views.properties.contexts.DataContextElement; +import org.eclipse.papyrus.infra.properties.contexts.DataContextElement; +import org.eclipse.papyrus.infra.properties.ui.UiFactory; +import org.eclipse.papyrus.infra.properties.ui.UiPackage; +import org.eclipse.papyrus.infra.properties.ui.WidgetAttribute; import org.eclipse.papyrus.views.properties.modelelement.AbstractModelElementFactory; -import org.eclipse.papyrus.views.properties.ui.UiFactory; -import org.eclipse.papyrus.views.properties.ui.UiPackage; -import org.eclipse.papyrus.views.properties.ui.WidgetAttribute; /** * A ModelElementFactory for handling {@link WidgetAttribute} properties diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/GenericPropertyModelElementFactory.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/GenericPropertyModelElementFactory.java index 0d93398b839..3e185312bfa 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/GenericPropertyModelElementFactory.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/GenericPropertyModelElementFactory.java @@ -23,7 +23,7 @@ import org.eclipse.papyrus.infra.constraints.ConfigProperty; import org.eclipse.papyrus.infra.constraints.ConstraintsFactory; import org.eclipse.papyrus.infra.constraints.ConstraintsPackage; import org.eclipse.papyrus.infra.emf.utils.EMFHelper; -import org.eclipse.papyrus.views.properties.contexts.DataContextElement; +import org.eclipse.papyrus.infra.properties.contexts.DataContextElement; import org.eclipse.papyrus.views.properties.modelelement.AbstractModelElementFactory; /** diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/SectionNameObservableValue.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/SectionNameObservableValue.java index eea6ec478da..59c5f867934 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/SectionNameObservableValue.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/SectionNameObservableValue.java @@ -20,9 +20,9 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.edit.command.SetCommand; import org.eclipse.emf.edit.domain.EditingDomain; +import org.eclipse.papyrus.infra.properties.contexts.ContextsPackage; +import org.eclipse.papyrus.infra.properties.contexts.Section; import org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableValue; -import org.eclipse.papyrus.views.properties.contexts.ContextsPackage; -import org.eclipse.papyrus.views.properties.contexts.Section; /** * An ObservableValue for handling changes in a section's name. diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/AbstractContextualContentProvider.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/AbstractContextualContentProvider.java index 0957d66017b..bd1107120b9 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/AbstractContextualContentProvider.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/AbstractContextualContentProvider.java @@ -19,11 +19,11 @@ import java.util.List; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.papyrus.infra.properties.contexts.Context; import org.eclipse.papyrus.infra.tools.util.ListHelper; import org.eclipse.papyrus.infra.ui.emf.providers.strategy.SemanticEMFContentProvider; import org.eclipse.papyrus.infra.ui.emf.utils.ProviderHelper; import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider; -import org.eclipse.papyrus.views.properties.contexts.Context; import org.eclipse.papyrus.views.properties.util.PropertiesUtil; /** diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/ConstraintDescriptorContentProvider.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/ConstraintDescriptorContentProvider.java index ee10f5ba4ec..b3d0f4f9acd 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/ConstraintDescriptorContentProvider.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/ConstraintDescriptorContentProvider.java @@ -18,10 +18,10 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor; import org.eclipse.papyrus.infra.constraints.DisplayUnit; -import org.eclipse.papyrus.views.properties.contexts.Context; -import org.eclipse.papyrus.views.properties.contexts.Section; -import org.eclipse.papyrus.views.properties.contexts.Tab; -import org.eclipse.papyrus.views.properties.contexts.View; +import org.eclipse.papyrus.infra.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.Section; +import org.eclipse.papyrus.infra.properties.contexts.Tab; +import org.eclipse.papyrus.infra.properties.contexts.View; /** * A ContentProvider for retrieving the available ConstraintDescriptors diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/ContextContentProvider.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/ContextContentProvider.java index b27d37a50c4..a3b60ff43a7 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/ContextContentProvider.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/ContextContentProvider.java @@ -19,8 +19,8 @@ import java.util.Set; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.papyrus.emf.facet.custom.ui.internal.CustomizedTreeContentProvider; +import org.eclipse.papyrus.infra.properties.contexts.Context; import org.eclipse.papyrus.infra.ui.emf.utils.ProviderHelper; -import org.eclipse.papyrus.views.properties.contexts.Context; import org.eclipse.papyrus.views.properties.util.PropertiesUtil; /** diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/DataContextElementContentProvider.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/DataContextElementContentProvider.java index 509aa095dcc..a462bab7d6a 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/DataContextElementContentProvider.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/DataContextElementContentProvider.java @@ -21,12 +21,12 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; +import org.eclipse.papyrus.infra.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.DataContextElement; +import org.eclipse.papyrus.infra.properties.contexts.DataContextPackage; +import org.eclipse.papyrus.infra.properties.contexts.DataContextRoot; import org.eclipse.papyrus.infra.widgets.providers.AbstractFilteredContentProvider; import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider; -import org.eclipse.papyrus.views.properties.contexts.Context; -import org.eclipse.papyrus.views.properties.contexts.DataContextElement; -import org.eclipse.papyrus.views.properties.contexts.DataContextPackage; -import org.eclipse.papyrus.views.properties.contexts.DataContextRoot; /** * A ContentProvider for retrieving the available DataContextElements diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/DependencyContentProvider.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/DependencyContentProvider.java index d520e5c5067..80b19b6f427 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/DependencyContentProvider.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/DependencyContentProvider.java @@ -16,8 +16,8 @@ import java.util.List; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.papyrus.infra.properties.contexts.Context; import org.eclipse.papyrus.infra.widgets.providers.AbstractStaticContentProvider; -import org.eclipse.papyrus.views.properties.contexts.Context; import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager; /** diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/EnvironmentContentProvider.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/EnvironmentContentProvider.java index 0c0985435d3..ab5c49940a4 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/EnvironmentContentProvider.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/EnvironmentContentProvider.java @@ -20,10 +20,10 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.papyrus.customization.properties.Activator; +import org.eclipse.papyrus.infra.properties.environment.Environment; import org.eclipse.papyrus.infra.ui.emf.providers.strategy.SemanticEMFContentProvider; import org.eclipse.papyrus.infra.ui.emf.utils.ProviderHelper; import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider; -import org.eclipse.papyrus.views.properties.environment.Environment; import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager; /** diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/PropertyContentProvider.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/PropertyContentProvider.java index dd6e71a942d..ee266b54158 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/PropertyContentProvider.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/PropertyContentProvider.java @@ -16,11 +16,11 @@ import java.util.LinkedList; import java.util.List; import org.eclipse.emf.ecore.EObject; +import org.eclipse.papyrus.infra.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.DataContextElement; +import org.eclipse.papyrus.infra.properties.contexts.DataContextPackage; +import org.eclipse.papyrus.infra.properties.contexts.Property; import org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider; -import org.eclipse.papyrus.views.properties.contexts.Context; -import org.eclipse.papyrus.views.properties.contexts.DataContextElement; -import org.eclipse.papyrus.views.properties.contexts.DataContextPackage; -import org.eclipse.papyrus.views.properties.contexts.Property; /** * A Content provider to retrieve all available properties in the current diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/PropertyEditorTypeContentProvider.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/PropertyEditorTypeContentProvider.java index 4e76beac33a..4cb7ffa87cc 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/PropertyEditorTypeContentProvider.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/PropertyEditorTypeContentProvider.java @@ -13,13 +13,13 @@ package org.eclipse.papyrus.customization.properties.providers; import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.papyrus.infra.properties.environment.PropertyEditorType; +import org.eclipse.papyrus.infra.properties.ui.PropertyEditor; import org.eclipse.papyrus.infra.ui.emf.providers.EMFGraphicalContentProvider; import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor; import org.eclipse.papyrus.infra.widgets.editors.BooleanToggle; import org.eclipse.papyrus.infra.widgets.editors.ICommitListener; import org.eclipse.papyrus.infra.widgets.providers.AbstractTreeFilter; -import org.eclipse.papyrus.views.properties.environment.PropertyEditorType; -import org.eclipse.papyrus.views.properties.ui.PropertyEditor; import org.eclipse.papyrus.views.properties.widgets.layout.PropertiesLayout; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/TabContentProvider.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/TabContentProvider.java index 1891a643a85..099aad3f90c 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/TabContentProvider.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/TabContentProvider.java @@ -15,8 +15,8 @@ import java.util.LinkedList; import java.util.List; import org.eclipse.emf.ecore.EObject; -import org.eclipse.papyrus.views.properties.contexts.Context; -import org.eclipse.papyrus.views.properties.contexts.Tab; +import org.eclipse.papyrus.infra.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.Tab; import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager; /** diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/query/DataContextsImageQuery.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/query/DataContextsImageQuery.java index 55224239740..b9bc39cd05e 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/query/DataContextsImageQuery.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/query/DataContextsImageQuery.java @@ -17,7 +17,7 @@ import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager; import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementException; import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2; import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2; -import org.eclipse.papyrus.views.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.Context; public class DataContextsImageQuery implements IJavaQuery2 { @Override diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/query/GetVisibleFeaturesQuery.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/query/GetVisibleFeaturesQuery.java index 4542011bab2..b583f648a93 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/query/GetVisibleFeaturesQuery.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/query/GetVisibleFeaturesQuery.java @@ -30,10 +30,10 @@ import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementEx import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2; import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2; import org.eclipse.papyrus.infra.constraints.ConstraintsPackage; -import org.eclipse.papyrus.views.properties.contexts.Context; -import org.eclipse.papyrus.views.properties.contexts.ContextsPackage; -import org.eclipse.papyrus.views.properties.contexts.util.ContextsSwitch; -import org.eclipse.papyrus.views.properties.ui.UiPackage; +import org.eclipse.papyrus.infra.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.ContextsPackage; +import org.eclipse.papyrus.infra.properties.contexts.util.ContextsSwitch; +import org.eclipse.papyrus.infra.properties.ui.UiPackage; /** * @author Camille Letavernier diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/query/ShowContextQuery.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/query/ShowContextQuery.java index ff72174a788..96427d76c8f 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/query/ShowContextQuery.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/query/ShowContextQuery.java @@ -16,7 +16,7 @@ import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager; import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementException; import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2; import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2; -import org.eclipse.papyrus.views.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.Context; /** * A Query to test if the DataContextElements should be displayed in the UIEditor diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/query/ViewsImageQuery.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/query/ViewsImageQuery.java index c53e45ad5ef..4a4b29bd026 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/query/ViewsImageQuery.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/query/ViewsImageQuery.java @@ -17,7 +17,7 @@ import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager; import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementException; import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2; import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2; -import org.eclipse.papyrus.views.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.Context; public class ViewsImageQuery implements IJavaQuery2 { @Override diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/ContextStorageActionRegistry.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/ContextStorageActionRegistry.java index 98782eea406..48c297d8a54 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/ContextStorageActionRegistry.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/ContextStorageActionRegistry.java @@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.Platform; import org.eclipse.papyrus.customization.properties.Activator; import org.eclipse.papyrus.infra.core.utils.OneTimeRegistryReader; -import org.eclipse.papyrus.views.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.Context; /** * This is the ContextStorageActionRegistry type. Enjoy. diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/ContextStorageActionUtil.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/ContextStorageActionUtil.java index dd62131cf5b..05386f3e3d4 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/ContextStorageActionUtil.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/ContextStorageActionUtil.java @@ -23,8 +23,8 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.papyrus.customization.properties.messages.Messages; -import org.eclipse.papyrus.views.properties.contexts.Context; -import org.eclipse.papyrus.views.properties.contexts.ContextsPackage; +import org.eclipse.papyrus.infra.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.ContextsPackage; /** diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/IContextCopyAction.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/IContextCopyAction.java index 86f799d0028..844a45fdfcb 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/IContextCopyAction.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/IContextCopyAction.java @@ -13,7 +13,7 @@ package org.eclipse.papyrus.customization.properties.storage.actions; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.papyrus.views.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.Context; import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager; diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/IContextDeleteAction.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/IContextDeleteAction.java index 74f4e9ec466..8fcafa49272 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/IContextDeleteAction.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/IContextDeleteAction.java @@ -13,7 +13,7 @@ package org.eclipse.papyrus.customization.properties.storage.actions; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.papyrus.views.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.Context; /** diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/IContextEditAction.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/IContextEditAction.java index e563bcb41c8..722e92b5e3d 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/IContextEditAction.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/IContextEditAction.java @@ -13,7 +13,7 @@ package org.eclipse.papyrus.customization.properties.storage.actions; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.papyrus.views.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.Context; /** diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/IContextStorageActionProvider.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/IContextStorageActionProvider.java index bba3be0f593..2893f0bd1a7 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/IContextStorageActionProvider.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/IContextStorageActionProvider.java @@ -11,7 +11,7 @@ *****************************************************************************/ package org.eclipse.papyrus.customization.properties.storage.actions; -import org.eclipse.papyrus.views.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.Context; /** diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/workspace/WorkspaceContextCopyAction.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/workspace/WorkspaceContextCopyAction.java index ccdd43c370a..5d021e2102b 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/workspace/WorkspaceContextCopyAction.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/workspace/WorkspaceContextCopyAction.java @@ -43,10 +43,10 @@ import org.eclipse.papyrus.customization.properties.Activator; import org.eclipse.papyrus.customization.properties.messages.Messages; import org.eclipse.papyrus.customization.properties.storage.actions.IContextCopyAction; import org.eclipse.papyrus.infra.emf.utils.EMFHelper; -import org.eclipse.papyrus.views.properties.catalog.PropertiesURIHandler; -import org.eclipse.papyrus.views.properties.contexts.Context; -import org.eclipse.papyrus.views.properties.contexts.Section; -import org.eclipse.papyrus.views.properties.contexts.Tab; +import org.eclipse.papyrus.infra.properties.catalog.PropertiesURIHandler; +import org.eclipse.papyrus.infra.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.Section; +import org.eclipse.papyrus.infra.properties.contexts.Tab; import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager; import org.eclipse.papyrus.views.properties.util.PropertiesUtil; diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/workspace/WorkspaceContextDeleteAction.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/workspace/WorkspaceContextDeleteAction.java index cfd2e84f32a..647d26d51f5 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/workspace/WorkspaceContextDeleteAction.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/workspace/WorkspaceContextDeleteAction.java @@ -20,7 +20,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; import org.eclipse.papyrus.customization.properties.messages.Messages; import org.eclipse.papyrus.customization.properties.storage.actions.IContextDeleteAction; -import org.eclipse.papyrus.views.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.Context; import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager; /** diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/workspace/WorkspaceContextEditAction.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/workspace/WorkspaceContextEditAction.java index eda4dd9cf3d..dd7061e7ead 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/workspace/WorkspaceContextEditAction.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/workspace/WorkspaceContextEditAction.java @@ -20,7 +20,7 @@ import org.eclipse.core.runtime.SubMonitor; import org.eclipse.papyrus.customization.properties.messages.Messages; import org.eclipse.papyrus.customization.properties.storage.actions.IContextEditAction; import org.eclipse.papyrus.customization.properties.util.ProjectUtil; -import org.eclipse.papyrus.views.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.Context; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.FileEditorInput; diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/workspace/WorkspaceContextStorageActionProvider.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/workspace/WorkspaceContextStorageActionProvider.java index a4bb8006499..61f2180a2ea 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/workspace/WorkspaceContextStorageActionProvider.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/workspace/WorkspaceContextStorageActionProvider.java @@ -16,7 +16,7 @@ import org.eclipse.papyrus.customization.properties.storage.actions.AbstractCont import org.eclipse.papyrus.customization.properties.storage.actions.IContextCopyAction; import org.eclipse.papyrus.customization.properties.storage.actions.IContextDeleteAction; import org.eclipse.papyrus.customization.properties.storage.actions.IContextEditAction; -import org.eclipse.papyrus.views.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.Context; /** diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CopyContextAction.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CopyContextAction.java index 068ad5066a0..a855f58a8b7 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CopyContextAction.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CopyContextAction.java @@ -20,7 +20,7 @@ import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.papyrus.customization.properties.Activator; import org.eclipse.papyrus.customization.properties.storage.actions.IContextCopyAction; -import org.eclipse.papyrus.views.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.Context; import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.statushandlers.StatusManager; diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CustomizationDialog.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CustomizationDialog.java index a47ffa09dce..d74dd620f6b 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CustomizationDialog.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CustomizationDialog.java @@ -33,9 +33,9 @@ import org.eclipse.papyrus.customization.properties.storage.actions.IContextCopy import org.eclipse.papyrus.customization.properties.storage.actions.IContextDeleteAction; import org.eclipse.papyrus.customization.properties.storage.actions.IContextEditAction; import org.eclipse.papyrus.customization.properties.storage.actions.IContextStorageActionProvider; +import org.eclipse.papyrus.infra.properties.contexts.Context; import org.eclipse.papyrus.infra.widgets.editors.InputDialog; import org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider; -import org.eclipse.papyrus.views.properties.contexts.Context; import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/EditContextAction.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/EditContextAction.java index 1fa19cb9a17..2c501d2023d 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/EditContextAction.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/EditContextAction.java @@ -20,7 +20,7 @@ import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.papyrus.customization.properties.Activator; import org.eclipse.papyrus.customization.properties.storage.actions.IContextEditAction; -import org.eclipse.papyrus.views.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.Context; import org.eclipse.swt.widgets.Display; /** diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/RemoveContextAction.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/RemoveContextAction.java index d245d848d73..d0f3e969474 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/RemoveContextAction.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/RemoveContextAction.java @@ -20,7 +20,7 @@ import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.papyrus.customization.properties.Activator; import org.eclipse.papyrus.customization.properties.storage.actions.IContextDeleteAction; -import org.eclipse.papyrus.views.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.Context; import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager; import org.eclipse.swt.widgets.Display; diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/util/ProjectUtil.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/util/ProjectUtil.java index 625997ec6d8..849e33ccc3c 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/util/ProjectUtil.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/util/ProjectUtil.java @@ -26,8 +26,8 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.papyrus.customization.properties.Activator; import org.eclipse.papyrus.customization.properties.storage.actions.workspace.WorkspaceContextCopyAction; -import org.eclipse.papyrus.views.properties.contexts.Context; -import org.eclipse.papyrus.views.properties.contexts.Section; +import org.eclipse.papyrus.infra.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.Section; /** * The Eclipse Editors can only handle files from the workspace. However, when diff --git a/plugins/customization/org.eclipse.papyrus.customization/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization/META-INF/MANIFEST.MF index dbb07f0ac64..054674bef5b 100644 --- a/plugins/customization/org.eclipse.papyrus.customization/META-INF/MANIFEST.MF +++ b/plugins/customization/org.eclipse.papyrus.customization/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.databinding;bundle-version="1.4.0", org.eclipse.emf.edit;bundle-version="2.7.0", org.eclipse.emf.databinding;bundle-version="1.2.0", - org.eclipse.papyrus.views.properties.model;bundle-version="1.2.0", + org.eclipse.papyrus.infra.properties;bundle-version="1.2.0", org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0" Export-Package: org.eclipse.papyrus.customization.factory, diff --git a/plugins/customization/org.eclipse.papyrus.customization/plugin.xml b/plugins/customization/org.eclipse.papyrus.customization/plugin.xml index 09386e5da59..b95289fe129 100644 --- a/plugins/customization/org.eclipse.papyrus.customization/plugin.xml +++ b/plugins/customization/org.eclipse.papyrus.customization/plugin.xml @@ -28,14 +28,14 @@ + point="org.eclipse.papyrus.infra.properties.contexts"> + point="org.eclipse.papyrus.infra.properties.environments"> diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewEnvironmentExtensionFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewEnvironmentExtensionFactory.java index 72fbaca2bc5..a147b43a576 100644 --- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewEnvironmentExtensionFactory.java +++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewEnvironmentExtensionFactory.java @@ -22,7 +22,7 @@ import org.eclipse.papyrus.customization.plugin.PluginEditor; public class PropertyViewEnvironmentExtensionFactory extends FileBasedExtensionFactory { public PropertyViewEnvironmentExtensionFactory() { - super(Messages.EnvironmentExtensionFactory_PropertyViewEnvironment, "org.eclipse.papyrus.views.properties.environment", "environmentModel", "environment", true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + super(Messages.EnvironmentExtensionFactory_PropertyViewEnvironment, "org.eclipse.papyrus.infra.properties.environment", "environmentModel", "environment", true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } @Override diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewExtensionFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewExtensionFactory.java index 620699bc821..b185feb1968 100644 --- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewExtensionFactory.java +++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewExtensionFactory.java @@ -38,8 +38,8 @@ import org.eclipse.papyrus.customization.model.customizationplugin.Customization import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement; import org.eclipse.papyrus.customization.plugin.PluginEditor; import org.eclipse.papyrus.infra.emf.utils.EMFHelper; +import org.eclipse.papyrus.infra.properties.contexts.Context; import org.eclipse.papyrus.infra.widgets.util.FileUtil; -import org.eclipse.papyrus.views.properties.contexts.Context; import org.eclipse.swt.widgets.Display; import org.w3c.dom.Element; diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/modelelement/CustomizationModelElementFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/modelelement/CustomizationModelElementFactory.java index 4771f71a058..ba8eb44dcdc 100644 --- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/modelelement/CustomizationModelElementFactory.java +++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/modelelement/CustomizationModelElementFactory.java @@ -18,7 +18,7 @@ import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.papyrus.customization.Activator; import org.eclipse.papyrus.infra.emf.utils.EMFHelper; -import org.eclipse.papyrus.views.properties.contexts.DataContextElement; +import org.eclipse.papyrus.infra.properties.contexts.DataContextElement; import org.eclipse.papyrus.views.properties.modelelement.EMFModelElement; import org.eclipse.papyrus.views.properties.modelelement.EMFModelElementFactory; -- cgit v1.2.3