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 <context>
element moved to a new *.infra.properties.contexts point.  The
<preferencePageBinding> element remains.

JUnit tests pass, at least inasmuch as they pass in the nightly builds.

Change-Id: I6445808f8eb1144b08c0cd5f0a487d1bad229a4c
---
 extraplugins/bpmn/org.eclipse.papyrus.bpmn/plugin.xml             | 2 +-
 .../META-INF/MANIFEST.MF                                          | 2 +-
 .../properties/storage/CDOContextStorageProvider.java             | 2 +-
 .../properties/storage/action/AbstractCDOContextAction.java       | 2 +-
 .../properties/storage/action/CDOContextCopyAction.java           | 8 ++++----
 .../properties/storage/action/CDOContextDeleteAction.java         | 2 +-
 .../properties/storage/action/CDOContextEditAction.java           | 2 +-
 .../storage/action/CDOContextStorageActionProvider.java           | 2 +-
 .../org.eclipse.papyrus.dsml.validation.properties/plugin.xml     | 2 +-
 extraplugins/layers/org.eclipse.papyrus.layers.ui/plugin.xml      | 2 +-
 .../properties/org.eclipse.papyrus.marte.properties/plugin.xml    | 2 +-
 .../org.eclipse.papyrus.migration.properties.model/plugin.xml     | 6 +++---
 .../migration/org.eclipse.papyrus.migration.rsa/plugin.xml        | 2 +-
 .../org.eclipse.papyrus.uml.diagram.ecore/plugin.xml              | 2 +-
 extraplugins/revision/org.eclipse.papyrus.revisiontool/plugin.xml | 6 +++---
 extraplugins/robotml/org.eclipse.papyrus.robotml/plugin.xml       | 2 +-
 .../org.eclipse.papyrus.umlrt.properties/META-INF/MANIFEST.MF     | 2 +-
 .../umlrt/org.eclipse.papyrus.umlrt.properties/plugin.xml         | 4 ++--
 .../properties/modelelement/UMLRTExtModelElementFactory.java      | 2 +-
 19 files changed, 27 insertions(+), 27 deletions(-)

(limited to 'extraplugins')

diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/plugin.xml b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/plugin.xml
index 00b5966d971..1ea6d8b0ed1 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/plugin.xml
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/plugin.xml
@@ -48,7 +48,7 @@
        </elementTypeSet>
     </extension>
     <extension
-          point="org.eclipse.papyrus.views.properties.context">
+          point="org.eclipse.papyrus.infra.properties.contexts">
        <context
              contextModel="properties/bpmn.ctx"
              isCustomizable="true">
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF
index aab6b26c3ef..9bb83bd1cbd 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.core.log;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;bundle-version="1.2.0",
  org.eclipse.papyrus.cdo.core;bundle-version="1.2.0",
  org.eclipse.emf.edit.ui;bundle-version="2.8.0",
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/CDOContextStorageProvider.java b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/CDOContextStorageProvider.java
index 3ae8f22500f..66c0495202c 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/CDOContextStorageProvider.java
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/CDOContextStorageProvider.java
@@ -37,7 +37,7 @@ import org.eclipse.papyrus.cdo.core.util.CDOFunctions;
 import org.eclipse.papyrus.cdo.core.util.CDOPredicates;
 import org.eclipse.papyrus.cdo.internal.core.CDOUtils;
 import org.eclipse.papyrus.cdo.internal.ui.customization.properties.Activator;
-import org.eclipse.papyrus.views.properties.contexts.Context;
+import org.eclipse.papyrus.infra.properties.contexts.Context;
 import org.eclipse.papyrus.views.properties.storage.AbstractContextStorageProvider;
 
 import com.google.common.base.Function;
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/AbstractCDOContextAction.java b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/AbstractCDOContextAction.java
index f31b6a927f6..6145ebe6b5e 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/AbstractCDOContextAction.java
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/AbstractCDOContextAction.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.papyrus.cdo.internal.ui.customization.properties.storage.CDOTextURIHandler;
-import org.eclipse.papyrus.views.properties.contexts.Context;
+import org.eclipse.papyrus.infra.properties.contexts.Context;
 
 /**
  * This is the AbstractCDOContextAction type. Enjoy.
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextCopyAction.java b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextCopyAction.java
index 1e0661635e9..fc5484c9647 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextCopyAction.java
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextCopyAction.java
@@ -58,10 +58,10 @@ import org.eclipse.papyrus.cdo.internal.ui.dialogs.CheckoutSelectionDialog;
 import org.eclipse.papyrus.customization.properties.storage.actions.ContextStorageActionUtil;
 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.util.PropertiesUtil;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextDeleteAction.java b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextDeleteAction.java
index d1f5383ced0..2a012364797 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextDeleteAction.java
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextDeleteAction.java
@@ -21,7 +21,7 @@ import org.eclipse.osgi.util.NLS;
 import org.eclipse.papyrus.cdo.internal.ui.customization.properties.Activator;
 import org.eclipse.papyrus.cdo.internal.ui.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;
 
 /**
  * This is the CDOContextDeleteAction type. Enjoy.
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextEditAction.java b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextEditAction.java
index a49a6d3d905..4d94d6fb29c 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextEditAction.java
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextEditAction.java
@@ -24,7 +24,7 @@ import org.eclipse.osgi.util.NLS;
 import org.eclipse.papyrus.cdo.internal.ui.customization.properties.Activator;
 import org.eclipse.papyrus.cdo.internal.ui.customization.properties.messages.Messages;
 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.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IPartListener;
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextStorageActionProvider.java b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextStorageActionProvider.java
index d332414952d..b5802246222 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextStorageActionProvider.java
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextStorageActionProvider.java
@@ -21,7 +21,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/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/plugin.xml b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/plugin.xml
index f980c228c58..fafa97753ac 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/plugin.xml
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/plugin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><?eclipse version="3.4"?>
 <plugin>
-<extension point="org.eclipse.papyrus.views.properties.context">
+<extension point="org.eclipse.papyrus.infra.properties.contexts">
 	<context
 		contextModel="/propertyView/dsmlvalidationproperties/dsmlvalidationproperties.ctx"
 		isCustomizable="true"/></extension>
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.ui/plugin.xml b/extraplugins/layers/org.eclipse.papyrus.layers.ui/plugin.xml
index dcb592311f6..8797c37c123 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.ui/plugin.xml
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.ui/plugin.xml
@@ -326,7 +326,7 @@
       </menuContribution>
    </extension>
    <extension
-         point="org.eclipse.papyrus.views.properties.context">
+         point="org.eclipse.papyrus.infra.properties.contexts">
       <context
             contextModel="properties/properties-orig.ctx"
             isCustomizable="true">
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/plugin.xml b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/plugin.xml
index 5dac8fffe01..dfbf2ad5504 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/plugin.xml
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/plugin.xml
@@ -2,7 +2,7 @@
 <?eclipse version="3.4"?>
 <plugin>
    <extension
-         point="org.eclipse.papyrus.views.properties.context">
+         point="org.eclipse.papyrus.infra.properties.contexts">
       <context
             contextModel="model/MARTE.ctx">
       </context>
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.properties.model/plugin.xml b/extraplugins/migration/org.eclipse.papyrus.migration.properties.model/plugin.xml
index ddb9f76073d..ca48af7b1c9 100644
--- a/extraplugins/migration/org.eclipse.papyrus.migration.properties.model/plugin.xml
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.properties.model/plugin.xml
@@ -5,7 +5,7 @@
          point="org.eclipse.ui.commands">
       <command
             description="Migrates the selected file to Papyrus 0.9.X"
-            id="org.eclipse.papyrus.views.properties.model.migration.migrate_0.9"
+            id="org.eclipse.papyrus.infra.properties.migration.migrate_0.9"
             name="Migrate to Papyrus 0.9.X">
       </command>
    </extension>
@@ -13,7 +13,7 @@
          point="org.eclipse.ui.handlers">
       <handler
             class="org.eclipse.papyrus.migration.properties.model.handler.MigrationHandler"
-            commandId="org.eclipse.papyrus.views.properties.model.migration.migrate_0.9">
+            commandId="org.eclipse.papyrus.infra.properties.migration.migrate_0.9">
       </handler>
    </extension>
    <extension
@@ -22,7 +22,7 @@
             allPopups="false"
             locationURI="popup:org.eclipse.ui.navigator.ProjectExplorer#PopupMenu?after=additions">
          <command
-               commandId="org.eclipse.papyrus.views.properties.model.migration.migrate_0.9"
+               commandId="org.eclipse.papyrus.infra.properties.migration.migrate_0.9"
                icon="icons/Customization.gif"
                style="push">
             <visibleWhen
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/plugin.xml b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/plugin.xml
index 3d5e0619e33..e2f5f96bd38 100644
--- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/plugin.xml
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/plugin.xml
@@ -404,7 +404,7 @@
             genModel="model/ui/rsaToPapyrusParameters.genmodel"/>
    </extension>
    <extension
-         point="org.eclipse.papyrus.views.properties.context">
+         point="org.eclipse.papyrus.infra.properties.contexts">
       <context
             contextModel="dialog/RSAToPapyrusParameters.ctx"
             isCustomizable="false">
diff --git a/extraplugins/papyrus4ecore/org.eclipse.papyrus.uml.diagram.ecore/plugin.xml b/extraplugins/papyrus4ecore/org.eclipse.papyrus.uml.diagram.ecore/plugin.xml
index 31391bd879f..6b51d32150c 100644
--- a/extraplugins/papyrus4ecore/org.eclipse.papyrus.uml.diagram.ecore/plugin.xml
+++ b/extraplugins/papyrus4ecore/org.eclipse.papyrus.uml.diagram.ecore/plugin.xml
@@ -15,7 +15,7 @@
       </menuCreationModel>
    </extension>
    <extension
-         point="org.eclipse.papyrus.views.properties.context">
+         point="org.eclipse.papyrus.infra.properties.contexts">
       <context
             contextModel="resources/property/ecoreUML.ctx"
             isCustomizable="true">
diff --git a/extraplugins/revision/org.eclipse.papyrus.revisiontool/plugin.xml b/extraplugins/revision/org.eclipse.papyrus.revisiontool/plugin.xml
index 345ad96a26f..e5e97075e60 100644
--- a/extraplugins/revision/org.eclipse.papyrus.revisiontool/plugin.xml
+++ b/extraplugins/revision/org.eclipse.papyrus.revisiontool/plugin.xml
@@ -58,9 +58,9 @@
             provider="CEA LIST">
       </profile>
    </extension>
-<extension point="org.eclipse.papyrus.views.properties.context">
-<context contextModel="properties/Review.ctx"/>
-</extension>
+   <extension point="org.eclipse.papyrus.infra.properties.contexts">
+      <context contextModel="properties/Review.ctx"/>
+   </extension>
 <extension
       point="org.eclipse.ui.handlers">
    <handler
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/plugin.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml/plugin.xml
index 108bb3e9d5a..9d81f0bd975 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/plugin.xml
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/plugin.xml
@@ -150,7 +150,7 @@
             class="org.eclipse.papyrus.RobotMLLibraries.RobotML_ModelLibrary.RobotML_DataTypes.std_datatypes.Std_datatypesPackage"
             genModel="model/RobotML.genmodel"/>
    </extension>
-   <extension point="org.eclipse.papyrus.views.properties.context">
+   <extension point="org.eclipse.papyrus.infra.properties.contexts">
       <context contextModel="properties/RobotMLProfile.ctx">
       </context>
    </extension>
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/META-INF/MANIFEST.MF b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/META-INF/MANIFEST.MF
index 18bd1a337ac..8a025d5b843 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/META-INF/MANIFEST.MF
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.umlrt;bundle-version="1.2.0",
  org.eclipse.core.databinding;bundle-version="1.4.2",
  org.eclipse.papyrus.infra.widgets;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.uml.tools;bundle-version="1.2.0",
  org.eclipse.papyrus.uml.properties;bundle-version="1.2.0",
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/plugin.xml b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/plugin.xml
index d2e3bf678eb..3064f1cd4b1 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/plugin.xml
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/plugin.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><?eclipse version="3.4"?>
 <plugin>
 	<extension
-			point="org.eclipse.papyrus.views.properties.context">
+			point="org.eclipse.papyrus.infra.properties.contexts">
 		<context contextModel="propertyView/UML-RT/uml-rt.ctx" isCustomizable="true"/>
 	</extension>
 
 	<extension
-			point="org.eclipse.papyrus.views.properties.environment">
+			point="org.eclipse.papyrus.infra.properties.environments">
 		<environment
 			environmentModel="propertyView/UML-RT/Environment.xmi">
 		</environment>
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/src/org/eclipse/papyrus/umlrt/properties/modelelement/UMLRTExtModelElementFactory.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/src/org/eclipse/papyrus/umlrt/properties/modelelement/UMLRTExtModelElementFactory.java
index 05c6e340446..6c0abf65b3f 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/src/org/eclipse/papyrus/umlrt/properties/modelelement/UMLRTExtModelElementFactory.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/src/org/eclipse/papyrus/umlrt/properties/modelelement/UMLRTExtModelElementFactory.java
@@ -2,10 +2,10 @@ package org.eclipse.papyrus.umlrt.properties.modelelement;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
 import org.eclipse.papyrus.uml.properties.modelelement.UMLModelElement;
 import org.eclipse.papyrus.uml.properties.modelelement.UMLModelElementFactory;
 import org.eclipse.papyrus.umlrt.properties.Activator;
-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;
 import org.eclipse.uml2.uml.Collaboration;
 
 public class UMLRTExtModelElementFactory extends UMLModelElementFactory {
-- 
cgit v1.2.3