Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian W. Damus2016-02-11 02:48:20 +0000
committerGerrit Code Review @ Eclipse.org2016-02-12 15:31:41 +0000
commitecd4928b327f5561364c5068c9ff5f1668e92d13 (patch)
tree7c34f46cf82a1d65ac753fa92c2a5d55371b8dba /plugins/infra/editor
parent751a204d74e15eb2db6b41c937691fc56dcc1252 (diff)
downloadorg.eclipse.papyrus-ecd4928b327f5561364c5068c9ff5f1668e92d13.tar.gz
org.eclipse.papyrus-ecd4928b327f5561364c5068c9ff5f1668e92d13.tar.xz
org.eclipse.papyrus-ecd4928b327f5561364c5068c9ff5f1668e92d13.zip
Bug 485220: [Architecture] Provide a more modular architecture
https://bugs.eclipse.org/bugs/show_bug.cgi?id=485220 Factor UI dependencies out of the UML Element Types bundle. This includes moving some advices that interact with the user into a new org.eclipse.papyrus.uml.service.types.ui bundle. Pull up the PasteCommandService and IPasteCommandProvider API into the Infra Diagram layer where the extension point is defined. Deprecate the old API in the UML layer. Introduce a service for participation of languages in CSS styling: * styling reset actions in the Reset Style command * access to semantic model classes and properties to make available to CSS Factor PapyrusObservableValue and cohorts out of the UML Tools bundle into the Infra Layer for more general reuse and to relieve the Diagram Infrastructure layer of UML dependencies. The old API remains as deprecated. Remove the Infra Diagram Layer dependency on UML Layer for property testers governing deletion in the diagram. Includes introduction of a new IGraphicalDeletionHelper OSGi service for delegation of the determination of whether an element can be deleted from the diagram and replacement of the XML expression properties * org.eclipse.papyrus.uml.diagram.common.isSemanticDeletion * org.eclipse.papyrus.uml.diagram.common.isReadOnly by * org.eclipse.papyrus.infra.gmfdiag.common.isSemanticDeletion * org.eclipse.papyrus.infra.gmfdiag.common.canDelete (where the latter is the negation of the property that it supersedes) Extract UML dependencies from the Diagram Outline and CSS Editor bundles. Remove unused MDTUtil APIs that referenced a UML-specific annotation. Move the Diagram Infrastructure CSS Palette bundle into the UML layer because it serves to provide extensions on the Palette Service, which is an overtly UML-specific capability. All client APIs for the Properties View are moved from org.eclipse.papyrus.views.properties bundle to a new org.eclipse.papyrus.infra.properties.ui bundle. This includes renaming of: * extension points * label-provider contexts * XWT namespaces Add an "all UI tests" suite. Define a componentized hierarchical build layout of the main plug-ins Change-Id: I43f8f3644857a18b69715f5a2f1da9b1cf286d67
Diffstat (limited to 'plugins/infra/editor')
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/META-INF/MANIFEST.MF2
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/model/general/ui/SingleLanguages.xwt4
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/plugin.xml2
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/pom.xml10
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/src/org/eclipse/papyrus/infra/editor/welcome/nattable/widgets/FormTable.java4
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF2
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/model/general/ui/SinglePageLayout.xwt4
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/model/general/ui/SingleViewLinks.xwt4
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/plugin.xml2
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/pom.xml10
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/WelcomePage.java18
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/modelelements/WelcomeModelElement.java2
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/modelelements/WelcomeModelElementFactory.java4
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/preferences/WelcomeContentPreferencePage.java2
-rw-r--r--plugins/infra/editor/pom.xml18
15 files changed, 51 insertions, 37 deletions
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/META-INF/MANIFEST.MF b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/META-INF/MANIFEST.MF
index c450e20c54b..8acb2478870 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/META-INF/MANIFEST.MF
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
org.eclipse.papyrus.infra.services.navigation;bundle-version="1.2.0",
org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.views.properties;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0",
org.eclipse.papyrus.infra.editor.welcome;bundle-version="1.2.0",
org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0",
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/model/general/ui/SingleLanguages.xwt b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/model/general/ui/SingleLanguages.xwt
index bc24cfadfc6..c3ab8bedc29 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/model/general/ui/SingleLanguages.xwt
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/model/general/ui/SingleLanguages.xwt
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Composite
- xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
- xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+ xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
xmlns:x="http://www.eclipse.org/xwt"
xmlns:ppew="clr-namespace:org.eclipse.papyrus.infra.editor.welcome.nattable.internal.widgets"
xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang">
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/plugin.xml b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/plugin.xml
index dad3b350c76..6bd3f53df61 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/plugin.xml
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/plugin.xml
@@ -19,7 +19,7 @@
</context>
</extension>
<extension
- point="org.eclipse.papyrus.views.properties.context">
+ point="org.eclipse.papyrus.infra.properties.ui.context">
<preferencePageBinding
context="welcome-languages"
page="org.eclipse.papyrus.infra.editor.welcome.content">
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/pom.xml b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/pom.xml
index e4cc773674d..f6ba2328c99 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/pom.xml
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/pom.xml
@@ -2,13 +2,11 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>org.eclipse.papyrus.releng</artifactId>
- <groupId>org.eclipse.papyrus</groupId>
- <version>1.2.0-SNAPSHOT</version>
- <relativePath>../../../../releng/main</relativePath>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.infra-editor</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.editor.welcome.nattable</artifactId>
- <groupId>org.eclipse.papyrus</groupId>
<version>1.2.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
-</project> \ No newline at end of file
+</project>
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/src/org/eclipse/papyrus/infra/editor/welcome/nattable/widgets/FormTable.java b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/src/org/eclipse/papyrus/infra/editor/welcome/nattable/widgets/FormTable.java
index c462564f8d8..655719ea4c0 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/src/org/eclipse/papyrus/infra/editor/welcome/nattable/widgets/FormTable.java
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/src/org/eclipse/papyrus/infra/editor/welcome/nattable/widgets/FormTable.java
@@ -49,11 +49,11 @@ import org.eclipse.papyrus.infra.editor.welcome.nattable.sorting.EventListObserv
import org.eclipse.papyrus.infra.editor.welcome.nattable.sorting.PapyrusGlazedListEventsLayer;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.DataSource;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.ModelElement;
import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
import org.eclipse.papyrus.infra.services.navigation.service.NavigationService;
import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
-import org.eclipse.papyrus.views.properties.modelelement.DataSource;
-import org.eclipse.papyrus.views.properties.modelelement.ModelElement;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF
index 4c4e96432bc..9dc8a6d97c7 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF
@@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
org.eclipse.ui;bundle-version="3.100.0",
org.eclipse.ui.forms;bundle-version="3.7.0",
- org.eclipse.papyrus.views.properties;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0",
org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0",
org.eclipse.papyrus.infra.properties;bundle-version="1.2.0",
org.eclipse.ui.views.properties.tabbed;bundle-version="3.6.0",
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/model/general/ui/SinglePageLayout.xwt b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/model/general/ui/SinglePageLayout.xwt
index 1962afdc7c2..e909789973a 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/model/general/ui/SinglePageLayout.xwt
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/model/general/ui/SinglePageLayout.xwt
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Composite
- xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
- xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+ xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
xmlns:x="http://www.eclipse.org/xwt"
xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang">
<Composite.layout>
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/model/general/ui/SingleViewLinks.xwt b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/model/general/ui/SingleViewLinks.xwt
index b1c595802be..5f223d17724 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/model/general/ui/SingleViewLinks.xwt
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/model/general/ui/SingleViewLinks.xwt
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
- xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
xmlns:ppew="clr-namespace:org.eclipse.papyrus.infra.editor.welcome.internal.widgets"
xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
xmlns="http://www.eclipse.org/xwt/presentation">
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/plugin.xml b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/plugin.xml
index dcc041ef167..f01798ab786 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/plugin.xml
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/plugin.xml
@@ -160,7 +160,7 @@
</context>
</extension>
<extension
- point="org.eclipse.papyrus.views.properties.context">
+ point="org.eclipse.papyrus.infra.properties.ui.context">
<preferencePageBinding
context="welcome-general"
page="org.eclipse.papyrus.infra.editor.welcome.content">
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/pom.xml b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/pom.xml
index 8ad03b63171..ec1b679a968 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/pom.xml
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/pom.xml
@@ -2,13 +2,11 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>org.eclipse.papyrus.releng</artifactId>
- <groupId>org.eclipse.papyrus</groupId>
- <version>1.2.0-SNAPSHOT</version>
- <relativePath>../../../../releng/main</relativePath>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.infra-editor</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.editor.welcome</artifactId>
- <groupId>org.eclipse.papyrus</groupId>
<version>1.2.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
-</project> \ No newline at end of file
+</project>
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/WelcomePage.java b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/WelcomePage.java
index baf0be3dd79..a3332bd2a88 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/WelcomePage.java
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/WelcomePage.java
@@ -23,15 +23,15 @@ import java.util.concurrent.CopyOnWriteArrayList;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.papyrus.infra.constraints.runtime.ConstraintEngine;
import org.eclipse.papyrus.infra.constraints.runtime.ConstraintEngineListener;
import org.eclipse.papyrus.infra.core.sasheditor.editor.ICloseablePart;
import org.eclipse.papyrus.infra.editor.welcome.IWelcomePageService;
import org.eclipse.papyrus.infra.properties.contexts.Section;
import org.eclipse.papyrus.infra.properties.contexts.View;
-import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;
-import org.eclipse.papyrus.views.properties.runtime.DefaultDisplayEngine;
-import org.eclipse.papyrus.views.properties.runtime.ViewConstraintEngine;
-import org.eclipse.papyrus.views.properties.xwt.XWTSection;
+import org.eclipse.papyrus.infra.properties.ui.runtime.DefaultDisplayEngine;
+import org.eclipse.papyrus.infra.properties.ui.runtime.PropertiesRuntime;
+import org.eclipse.papyrus.infra.properties.ui.xwt.XWTSection;
import org.eclipse.swt.layout.FormLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
@@ -49,7 +49,7 @@ public class WelcomePage implements ICloseablePart {
private final Object model;
private FormToolkit toolkit;
- private ViewConstraintEngine constraintEngine;
+ private ConstraintEngine<View> constraintEngine;
private ConstraintEngineListener constraintsListener;
private DefaultDisplayEngine displayEngine;
private ScrolledForm form;
@@ -94,7 +94,7 @@ public class WelcomePage implements ICloseablePart {
public Composite createControl(Composite parent) {
toolkit = new FormToolkit(parent.getDisplay());
- constraintEngine = ConfigurationManager.getInstance().getConstraintEngine();
+ constraintEngine = PropertiesRuntime.getConstraintEngine();
displayEngine = new DefaultDisplayEngine(false);
attachConstraintEngine(constraintEngine);
@@ -114,7 +114,7 @@ public class WelcomePage implements ICloseablePart {
return form;
}
- protected void attachConstraintEngine(ViewConstraintEngine engine) {
+ protected void attachConstraintEngine(ConstraintEngine<? extends View> engine) {
constraintsListener = event -> rebuildSections(form.getBody());
engine.addConstraintEngineListener(constraintsListener);
}
@@ -148,8 +148,7 @@ public class WelcomePage implements ICloseablePart {
}
protected void createSections(Composite parent) {
- IStructuredSelection selection = new StructuredSelection(model);
- Set<View> views = constraintEngine.getViews(selection);
+ Set<View> views = constraintEngine.getDisplayUnits(model);
// Get the unique tabs
Map<String, WelcomeTab> tabProxies = new HashMap<>();
@@ -177,6 +176,7 @@ public class WelcomePage implements ICloseablePart {
next.filterSections(views);
}
+ IStructuredSelection selection = new StructuredSelection(model);
for (WelcomeTab tab : tabs) {
for (Section section : tab.getSections()) {
XWTSection xwtSection = new XWTSection(section, tab.getView(section), displayEngine);
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/modelelements/WelcomeModelElement.java b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/modelelements/WelcomeModelElement.java
index d532ec98dcb..f80a66b83c8 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/modelelements/WelcomeModelElement.java
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/modelelements/WelcomeModelElement.java
@@ -17,7 +17,7 @@ import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.papyrus.views.properties.modelelement.EMFModelElement;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement;
/**
* @author damus
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/modelelements/WelcomeModelElementFactory.java b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/modelelements/WelcomeModelElementFactory.java
index e0daf707530..0c194ed6a9f 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/modelelements/WelcomeModelElementFactory.java
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/modelelements/WelcomeModelElementFactory.java
@@ -15,10 +15,10 @@ package org.eclipse.papyrus.infra.editor.welcome.internal.modelelements;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.papyrus.infra.editor.welcome.internal.Activator;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
-import org.eclipse.papyrus.views.properties.Activator;
-import org.eclipse.papyrus.views.properties.modelelement.AbstractEMFModelElementFactory;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.AbstractEMFModelElementFactory;
/**
* @author damus
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/preferences/WelcomeContentPreferencePage.java b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/preferences/WelcomeContentPreferencePage.java
index e981eb4cbda..887f0793977 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/preferences/WelcomeContentPreferencePage.java
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/preferences/WelcomeContentPreferencePage.java
@@ -18,7 +18,7 @@ import java.io.IOException;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.papyrus.infra.editor.welcome.internal.Activator;
-import org.eclipse.papyrus.views.properties.preferences.Preferences;
+import org.eclipse.papyrus.infra.properties.ui.preferences.Preferences;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
diff --git a/plugins/infra/editor/pom.xml b/plugins/infra/editor/pom.xml
new file mode 100644
index 00000000000..cecfbde54b6
--- /dev/null
+++ b/plugins/infra/editor/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.eclipse.papyrus.infra-editor</artifactId>
+ <packaging>pom</packaging>
+ <parent>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.infra</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <name>Papyrus Editor Welcome Page</name>
+ <description>Model and implementation of the extensible Welcome Page of the Papyrus Editor.</description>
+
+ <modules>
+ <module>org.eclipse.papyrus.infra.editor.welcome</module>
+ <module>org.eclipse.papyrus.infra.editor.welcome.nattable</module>
+ </modules>
+</project>

Back to the top