359794: [UML - Tools] Content/Label providers

https://bugs.eclipse.org/bugs/show_bug.cgi?id=359794

367066: [Refactoring] There should be a central generic plug-in for pure EMF-based tools
https://bugs.eclipse.org/bugs/show_bug.cgi?id=367066

351802: [Constraints] The Property View constraints model should be more generic
https://bugs.eclipse.org/bugs/show_bug.cgi?id=351802

11 files changed, 251 insertions, 506 deletions

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/META-INF/MANIFEST.MF b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/META-INF/MANIFEST.MF
index 6190ffafa15..d0b073e2579 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/META-INF/MANIFEST.MF
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/META-INF/MANIFEST.MF
@@ -13,7 +13,9 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore.xmi;visibility:=reexport,

  org.eclipse.emf.edit.ui;visibility:=reexport,

  org.eclipse.ui.ide;visibility:=reexport,

- org.eclipse.emf.ecore.editor;bundle-version="2.7.0"

+ org.eclipse.emf.ecore.editor;bundle-version="2.7.0",

+ org.eclipse.papyrus.infra.constraints;bundle-version="0.9.0",

+ org.eclipse.papyrus.infra.constraints.editor;bundle-version="1.0.0"

 Bundle-Vendor: %providerName

 Bundle-Version: 0.9.0.qualifier

 Bundle-ManifestVersion: 2

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/contexts/presentation/ContextsActionBarContributor.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/contexts/presentation/ContextsActionBarContributor.java
index ecec007c850..b4f292c5525 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/contexts/presentation/ContextsActionBarContributor.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/contexts/presentation/ContextsActionBarContributor.java
@@ -1,31 +1,23 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+/**

+ * <copyright>

+ * </copyright>

  *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

+ * $Id$

+ */

 package org.eclipse.papyrus.views.properties.contexts.presentation;

 

 import java.util.ArrayList;

 import java.util.Collection;

 

 import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-

 import org.eclipse.emf.edit.domain.EditingDomain;

 import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-

 import org.eclipse.emf.edit.ui.action.ControlAction;

 import org.eclipse.emf.edit.ui.action.CreateChildAction;

 import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

 import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

 import org.eclipse.emf.edit.ui.action.LoadResourceAction;

 import org.eclipse.emf.edit.ui.action.ValidateAction;

-

 import org.eclipse.jface.action.Action;

 import org.eclipse.jface.action.ActionContributionItem;

 import org.eclipse.jface.action.IAction;

@@ -37,16 +29,13 @@ import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.action.MenuManager;

 import org.eclipse.jface.action.Separator;

 import org.eclipse.jface.action.SubContributionItem;

-

 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.ISelectionChangedListener;

 import org.eclipse.jface.viewers.ISelectionProvider;

 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.viewers.SelectionChangedEvent;

 import org.eclipse.jface.viewers.Viewer;

-

 import org.eclipse.papyrus.views.properties.environment.presentation.PropertiesEditorPlugin;

-

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.PartInitException;

 

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/contexts/presentation/ContextsEditor.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/contexts/presentation/ContextsEditor.java
index b15d00abc95..8020baac8b1 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/contexts/presentation/ContextsEditor.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/contexts/presentation/ContextsEditor.java
@@ -1,20 +1,14 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+/**

+ * <copyright>

+ * </copyright>

  *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

+ * $Id$

+ */

 package org.eclipse.papyrus.views.properties.contexts.presentation;

 

 

 import java.io.IOException;

 import java.io.InputStream;

-

 import java.util.ArrayList;

 import java.util.Collection;

 import java.util.Collections;

@@ -33,22 +27,56 @@ import org.eclipse.core.resources.IResourceChangeListener;
 import org.eclipse.core.resources.IResourceDelta;

 import org.eclipse.core.resources.IResourceDeltaVisitor;

 import org.eclipse.core.resources.ResourcesPlugin;

-

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.core.runtime.IPath;

 import org.eclipse.core.runtime.IProgressMonitor;

 import org.eclipse.core.runtime.NullProgressMonitor;

-

+import org.eclipse.emf.common.command.BasicCommandStack;

+import org.eclipse.emf.common.command.Command;

+import org.eclipse.emf.common.command.CommandStack;

+import org.eclipse.emf.common.command.CommandStackListener;

+import org.eclipse.emf.common.notify.AdapterFactory;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.ui.MarkerHelper;

+import org.eclipse.emf.common.ui.ViewerPane;

+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

+import org.eclipse.emf.common.ui.viewer.IViewerProvider;

+import org.eclipse.emf.common.util.BasicDiagnostic;

+import org.eclipse.emf.common.util.Diagnostic;

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EValidator;

+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.resource.ResourceSet;

+import org.eclipse.emf.ecore.util.EContentAdapter;

+import org.eclipse.emf.ecore.util.EcoreUtil;

+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

+import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.emf.edit.domain.IEditingDomainProvider;

+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

+import org.eclipse.emf.edit.ui.util.EditUIUtil;

+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

 import org.eclipse.jface.action.IMenuListener;

 import org.eclipse.jface.action.IMenuManager;

 import org.eclipse.jface.action.IStatusLineManager;

 import org.eclipse.jface.action.IToolBarManager;

 import org.eclipse.jface.action.MenuManager;

 import org.eclipse.jface.action.Separator;

-

 import org.eclipse.jface.dialogs.MessageDialog;

 import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-

 import org.eclipse.jface.viewers.ColumnWeightData;

 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.ISelectionChangedListener;

@@ -62,28 +90,25 @@ import org.eclipse.jface.viewers.TableLayout;
 import org.eclipse.jface.viewers.TableViewer;

 import org.eclipse.jface.viewers.TreeViewer;

 import org.eclipse.jface.viewers.Viewer;

-

+import org.eclipse.papyrus.infra.constraints.provider.ConstraintsItemProviderAdapterFactory;

+import org.eclipse.papyrus.views.properties.contexts.provider.ContextsItemProviderAdapterFactory;

+import org.eclipse.papyrus.views.properties.environment.presentation.PropertiesEditorPlugin;

+import org.eclipse.papyrus.views.properties.environment.provider.EnvironmentItemProviderAdapterFactory;

+import org.eclipse.papyrus.views.properties.ui.provider.UiItemProviderAdapterFactory;

 import org.eclipse.swt.SWT;

-

 import org.eclipse.swt.custom.CTabFolder;

-

 import org.eclipse.swt.dnd.DND;

 import org.eclipse.swt.dnd.Transfer;

-

 import org.eclipse.swt.events.ControlAdapter;

 import org.eclipse.swt.events.ControlEvent;

-

 import org.eclipse.swt.graphics.Point;

-

 import org.eclipse.swt.layout.FillLayout;

-

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Menu;

 import org.eclipse.swt.widgets.Table;

 import org.eclipse.swt.widgets.TableColumn;

 import org.eclipse.swt.widgets.Tree;

 import org.eclipse.swt.widgets.TreeColumn;

-

 import org.eclipse.ui.IActionBars;

 import org.eclipse.ui.IEditorInput;

 import org.eclipse.ui.IEditorPart;

@@ -91,88 +116,18 @@ import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.IPartListener;

 import org.eclipse.ui.IWorkbenchPart;

 import org.eclipse.ui.PartInitException;

-

+import org.eclipse.ui.actions.WorkspaceModifyOperation;

 import org.eclipse.ui.dialogs.SaveAsDialog;

-

 import org.eclipse.ui.ide.IGotoMarker;

-

 import org.eclipse.ui.part.FileEditorInput;

 import org.eclipse.ui.part.MultiPageEditorPart;

-

 import org.eclipse.ui.views.contentoutline.ContentOutline;

 import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

 import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-

 import org.eclipse.ui.views.properties.IPropertySheetPage;

 import org.eclipse.ui.views.properties.PropertySheet;

 import org.eclipse.ui.views.properties.PropertySheetPage;

 

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.command.CommandStackListener;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.common.ui.MarkerHelper;

-import org.eclipse.emf.common.ui.ViewerPane;

-

-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

-

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.URI;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EValidator;

-

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-

-

-

-

-import org.eclipse.papyrus.views.properties.contexts.provider.ContextsItemProviderAdapterFactory;

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-import org.eclipse.papyrus.views.properties.environment.presentation.PropertiesEditorPlugin;

-import org.eclipse.papyrus.views.properties.environment.provider.EnvironmentItemProviderAdapterFactory;

-import org.eclipse.papyrus.views.properties.ui.provider.UiItemProviderAdapterFactory;

-

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

 

 /**

  * This is an example of a Contexts model editor.

@@ -709,6 +664,8 @@ public class ContextsEditor
 		adapterFactory.addAdapterFactory(new EnvironmentItemProviderAdapterFactory());

 		adapterFactory.addAdapterFactory(new ContextsItemProviderAdapterFactory());

 		adapterFactory.addAdapterFactory(new UiItemProviderAdapterFactory());

+		adapterFactory.addAdapterFactory(new ConstraintsItemProviderAdapterFactory());

+		adapterFactory.addAdapterFactory(new org.eclipse.papyrus.infra.constraints.environment.provider.EnvironmentItemProviderAdapterFactory());

 		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

 		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

 

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/contexts/presentation/ContextsModelWizard.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/contexts/presentation/ContextsModelWizard.java
index 24ac8cccc71..e39a35a3830 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/contexts/presentation/ContextsModelWizard.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/contexts/presentation/ContextsModelWizard.java
@@ -1,14 +1,9 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+/**

+ * <copyright>

+ * </copyright>

  *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

+ * $Id$

+ */

 package org.eclipse.papyrus.views.properties.contexts.presentation;

 

 

@@ -22,78 +17,52 @@ import java.util.Map;
 import java.util.MissingResourceException;

 import java.util.StringTokenizer;

 

+import org.eclipse.core.resources.IContainer;

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IFolder;

+import org.eclipse.core.resources.IProject;

+import org.eclipse.core.resources.IResource;

+import org.eclipse.core.resources.ResourcesPlugin;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.core.runtime.Path;

 import org.eclipse.emf.common.CommonPlugin;

-

 import org.eclipse.emf.common.util.URI;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EClassifier;

-

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.resource.Resource;

 import org.eclipse.emf.ecore.resource.ResourceSet;

-

 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-

-import org.eclipse.emf.ecore.EObject;

-

 import org.eclipse.emf.ecore.xmi.XMLResource;

-

 import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ResourcesPlugin;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-

 import org.eclipse.jface.dialogs.MessageDialog;

-

+import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.IStructuredSelection;

-

+import org.eclipse.jface.viewers.StructuredSelection;

 import org.eclipse.jface.wizard.Wizard;

 import org.eclipse.jface.wizard.WizardPage;

-

+import org.eclipse.papyrus.views.properties.contexts.ContextsFactory;

+import org.eclipse.papyrus.views.properties.contexts.ContextsPackage;

+import org.eclipse.papyrus.views.properties.environment.presentation.PropertiesEditorPlugin;

+import org.eclipse.papyrus.views.properties.environment.provider.PropertiesEditPlugin;

 import org.eclipse.swt.SWT;

-

-import org.eclipse.swt.events.ModifyListener;

 import org.eclipse.swt.events.ModifyEvent;

-

+import org.eclipse.swt.events.ModifyListener;

 import org.eclipse.swt.layout.GridData;

 import org.eclipse.swt.layout.GridLayout;

-

 import org.eclipse.swt.widgets.Combo;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Label;

-

 import org.eclipse.ui.INewWizard;

 import org.eclipse.ui.IWorkbench;

-

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.ISetSelectionTarget;

-

-

-

-import org.eclipse.core.runtime.Path;

-

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-

-import org.eclipse.papyrus.views.properties.contexts.ContextsFactory;

-import org.eclipse.papyrus.views.properties.contexts.ContextsPackage;

-import org.eclipse.papyrus.views.properties.environment.presentation.PropertiesEditorPlugin;

-import org.eclipse.papyrus.views.properties.environment.provider.PropertiesEditPlugin;

-

 import org.eclipse.ui.IWorkbenchPage;

 import org.eclipse.ui.IWorkbenchPart;

 import org.eclipse.ui.IWorkbenchWindow;

 import org.eclipse.ui.PartInitException;

+import org.eclipse.ui.actions.WorkspaceModifyOperation;

+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

+import org.eclipse.ui.part.FileEditorInput;

+import org.eclipse.ui.part.ISetSelectionTarget;

 

 

 /**

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/environment/presentation/EnvironmentActionBarContributor.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/environment/presentation/EnvironmentActionBarContributor.java
index d3fa6168f6e..a26e4096ab8 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/environment/presentation/EnvironmentActionBarContributor.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/environment/presentation/EnvironmentActionBarContributor.java
@@ -1,31 +1,23 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+/**

+ * <copyright>

+ * </copyright>

  *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

+ * $Id$

+ */

 package org.eclipse.papyrus.views.properties.environment.presentation;

 

 import java.util.ArrayList;

 import java.util.Collection;

 

 import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-

 import org.eclipse.emf.edit.domain.EditingDomain;

 import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-

 import org.eclipse.emf.edit.ui.action.ControlAction;

 import org.eclipse.emf.edit.ui.action.CreateChildAction;

 import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

 import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

 import org.eclipse.emf.edit.ui.action.LoadResourceAction;

 import org.eclipse.emf.edit.ui.action.ValidateAction;

-

 import org.eclipse.jface.action.Action;

 import org.eclipse.jface.action.ActionContributionItem;

 import org.eclipse.jface.action.IAction;

@@ -37,14 +29,12 @@ import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.action.MenuManager;

 import org.eclipse.jface.action.Separator;

 import org.eclipse.jface.action.SubContributionItem;

-

 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.ISelectionChangedListener;

 import org.eclipse.jface.viewers.ISelectionProvider;

 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.viewers.SelectionChangedEvent;

 import org.eclipse.jface.viewers.Viewer;

-

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.PartInitException;

 

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/environment/presentation/EnvironmentEditor.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/environment/presentation/EnvironmentEditor.java
index c67ce65b392..cf1fa559621 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/environment/presentation/EnvironmentEditor.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/environment/presentation/EnvironmentEditor.java
@@ -1,20 +1,14 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+/**

+ * <copyright>

+ * </copyright>

  *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

+ * $Id$

+ */

 package org.eclipse.papyrus.views.properties.environment.presentation;

 

 

 import java.io.IOException;

 import java.io.InputStream;

-

 import java.util.ArrayList;

 import java.util.Collection;

 import java.util.Collections;

@@ -33,22 +27,56 @@ import org.eclipse.core.resources.IResourceChangeListener;
 import org.eclipse.core.resources.IResourceDelta;

 import org.eclipse.core.resources.IResourceDeltaVisitor;

 import org.eclipse.core.resources.ResourcesPlugin;

-

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.core.runtime.IPath;

 import org.eclipse.core.runtime.IProgressMonitor;

 import org.eclipse.core.runtime.NullProgressMonitor;

-

+import org.eclipse.emf.common.command.BasicCommandStack;

+import org.eclipse.emf.common.command.Command;

+import org.eclipse.emf.common.command.CommandStack;

+import org.eclipse.emf.common.command.CommandStackListener;

+import org.eclipse.emf.common.notify.AdapterFactory;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.ui.MarkerHelper;

+import org.eclipse.emf.common.ui.ViewerPane;

+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

+import org.eclipse.emf.common.ui.viewer.IViewerProvider;

+import org.eclipse.emf.common.util.BasicDiagnostic;

+import org.eclipse.emf.common.util.Diagnostic;

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EValidator;

+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.resource.ResourceSet;

+import org.eclipse.emf.ecore.util.EContentAdapter;

+import org.eclipse.emf.ecore.util.EcoreUtil;

+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

+import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.emf.edit.domain.IEditingDomainProvider;

+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

+import org.eclipse.emf.edit.ui.util.EditUIUtil;

+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

 import org.eclipse.jface.action.IMenuListener;

 import org.eclipse.jface.action.IMenuManager;

 import org.eclipse.jface.action.IStatusLineManager;

 import org.eclipse.jface.action.IToolBarManager;

 import org.eclipse.jface.action.MenuManager;

 import org.eclipse.jface.action.Separator;

-

 import org.eclipse.jface.dialogs.MessageDialog;

 import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-

 import org.eclipse.jface.viewers.ColumnWeightData;

 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.ISelectionChangedListener;

@@ -62,28 +90,24 @@ import org.eclipse.jface.viewers.TableLayout;
 import org.eclipse.jface.viewers.TableViewer;

 import org.eclipse.jface.viewers.TreeViewer;

 import org.eclipse.jface.viewers.Viewer;

-

+import org.eclipse.papyrus.infra.constraints.provider.ConstraintsItemProviderAdapterFactory;

+import org.eclipse.papyrus.views.properties.contexts.provider.ContextsItemProviderAdapterFactory;

+import org.eclipse.papyrus.views.properties.environment.provider.EnvironmentItemProviderAdapterFactory;

+import org.eclipse.papyrus.views.properties.ui.provider.UiItemProviderAdapterFactory;

 import org.eclipse.swt.SWT;

-

 import org.eclipse.swt.custom.CTabFolder;

-

 import org.eclipse.swt.dnd.DND;

 import org.eclipse.swt.dnd.Transfer;

-

 import org.eclipse.swt.events.ControlAdapter;

 import org.eclipse.swt.events.ControlEvent;

-

 import org.eclipse.swt.graphics.Point;

-

 import org.eclipse.swt.layout.FillLayout;

-

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Menu;

 import org.eclipse.swt.widgets.Table;

 import org.eclipse.swt.widgets.TableColumn;

 import org.eclipse.swt.widgets.Tree;

 import org.eclipse.swt.widgets.TreeColumn;

-

 import org.eclipse.ui.IActionBars;

 import org.eclipse.ui.IEditorInput;

 import org.eclipse.ui.IEditorPart;

@@ -91,86 +115,18 @@ import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.IPartListener;

 import org.eclipse.ui.IWorkbenchPart;

 import org.eclipse.ui.PartInitException;

-

+import org.eclipse.ui.actions.WorkspaceModifyOperation;

 import org.eclipse.ui.dialogs.SaveAsDialog;

-

 import org.eclipse.ui.ide.IGotoMarker;

-

 import org.eclipse.ui.part.FileEditorInput;

 import org.eclipse.ui.part.MultiPageEditorPart;

-

 import org.eclipse.ui.views.contentoutline.ContentOutline;

 import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

 import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-

 import org.eclipse.ui.views.properties.IPropertySheetPage;

 import org.eclipse.ui.views.properties.PropertySheet;

 import org.eclipse.ui.views.properties.PropertySheetPage;

 

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.command.CommandStackListener;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.common.ui.MarkerHelper;

-import org.eclipse.emf.common.ui.ViewerPane;

-

-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

-

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.URI;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EValidator;

-

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-

-

-

-import org.eclipse.papyrus.views.properties.contexts.provider.ContextsItemProviderAdapterFactory;

-import org.eclipse.papyrus.views.properties.environment.provider.EnvironmentItemProviderAdapterFactory;

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-import org.eclipse.papyrus.views.properties.ui.provider.UiItemProviderAdapterFactory;

-

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

 

 /**

  * This is an example of a Environment model editor.

@@ -707,6 +663,8 @@ public class EnvironmentEditor
 		adapterFactory.addAdapterFactory(new EnvironmentItemProviderAdapterFactory());

 		adapterFactory.addAdapterFactory(new ContextsItemProviderAdapterFactory());

 		adapterFactory.addAdapterFactory(new UiItemProviderAdapterFactory());

+		adapterFactory.addAdapterFactory(new ConstraintsItemProviderAdapterFactory());

+		adapterFactory.addAdapterFactory(new org.eclipse.papyrus.infra.constraints.environment.provider.EnvironmentItemProviderAdapterFactory());

 		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

 		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

 

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/environment/presentation/EnvironmentModelWizard.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/environment/presentation/EnvironmentModelWizard.java
index 90536edc102..5f8fd2ebb76 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/environment/presentation/EnvironmentModelWizard.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/environment/presentation/EnvironmentModelWizard.java
@@ -1,14 +1,9 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+/**

+ * <copyright>

+ * </copyright>

  *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

+ * $Id$

+ */

 package org.eclipse.papyrus.views.properties.environment.presentation;

 

 

@@ -22,76 +17,51 @@ import java.util.Map;
 import java.util.MissingResourceException;

 import java.util.StringTokenizer;

 

+import org.eclipse.core.resources.IContainer;

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IFolder;

+import org.eclipse.core.resources.IProject;

+import org.eclipse.core.resources.IResource;

+import org.eclipse.core.resources.ResourcesPlugin;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.core.runtime.Path;

 import org.eclipse.emf.common.CommonPlugin;

-

 import org.eclipse.emf.common.util.URI;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EClassifier;

-

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.resource.Resource;

 import org.eclipse.emf.ecore.resource.ResourceSet;

-

 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-

-import org.eclipse.emf.ecore.EObject;

-

 import org.eclipse.emf.ecore.xmi.XMLResource;

-

 import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ResourcesPlugin;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-

 import org.eclipse.jface.dialogs.MessageDialog;

-

+import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.IStructuredSelection;

-

+import org.eclipse.jface.viewers.StructuredSelection;

 import org.eclipse.jface.wizard.Wizard;

 import org.eclipse.jface.wizard.WizardPage;

-

+import org.eclipse.papyrus.views.properties.environment.EnvironmentFactory;

+import org.eclipse.papyrus.views.properties.environment.EnvironmentPackage;

+import org.eclipse.papyrus.views.properties.environment.provider.PropertiesEditPlugin;

 import org.eclipse.swt.SWT;

-

-import org.eclipse.swt.events.ModifyListener;

 import org.eclipse.swt.events.ModifyEvent;

-

+import org.eclipse.swt.events.ModifyListener;

 import org.eclipse.swt.layout.GridData;

 import org.eclipse.swt.layout.GridLayout;

-

 import org.eclipse.swt.widgets.Combo;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Label;

-

 import org.eclipse.ui.INewWizard;

 import org.eclipse.ui.IWorkbench;

-

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.ISetSelectionTarget;

-

-import org.eclipse.papyrus.views.properties.environment.EnvironmentFactory;

-import org.eclipse.papyrus.views.properties.environment.EnvironmentPackage;

-import org.eclipse.papyrus.views.properties.environment.provider.PropertiesEditPlugin;

-

-

-import org.eclipse.core.runtime.Path;

-

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-

 import org.eclipse.ui.IWorkbenchPage;

 import org.eclipse.ui.IWorkbenchPart;

 import org.eclipse.ui.IWorkbenchWindow;

 import org.eclipse.ui.PartInitException;

+import org.eclipse.ui.actions.WorkspaceModifyOperation;

+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

+import org.eclipse.ui.part.FileEditorInput;

+import org.eclipse.ui.part.ISetSelectionTarget;

 

 

 /**

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/environment/presentation/PropertiesEditorPlugin.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/environment/presentation/PropertiesEditorPlugin.java
index 528406a51fb..2e84ce4abef 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/environment/presentation/PropertiesEditorPlugin.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/environment/presentation/PropertiesEditorPlugin.java
@@ -1,22 +1,16 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+/**

+ * <copyright>

+ * </copyright>

  *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

+ * $Id$

+ */

 package org.eclipse.papyrus.views.properties.environment.presentation;

 

 import org.eclipse.emf.common.EMFPlugin;

-

 import org.eclipse.emf.common.ui.EclipseUIPlugin;

-

 import org.eclipse.emf.common.util.ResourceLocator;

 import org.eclipse.emf.ecore.provider.EcoreEditPlugin;

+import org.eclipse.papyrus.infra.constraints.provider.ConstraintsEditPlugin;

 

 /**

  * This is the central singleton for the Properties editor plugin.

@@ -50,6 +44,7 @@ public final class PropertiesEditorPlugin extends EMFPlugin {
 	public PropertiesEditorPlugin() {

 		super

 			(new ResourceLocator [] {

+				ConstraintsEditPlugin.INSTANCE,

 				EcoreEditPlugin.INSTANCE,

 			});

 	}

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/ui/presentation/UiActionBarContributor.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/ui/presentation/UiActionBarContributor.java
index 1e86533e75f..f2125b07329 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/ui/presentation/UiActionBarContributor.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/ui/presentation/UiActionBarContributor.java
@@ -1,31 +1,23 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+/**

+ * <copyright>

+ * </copyright>

  *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

+ * $Id$

+ */

 package org.eclipse.papyrus.views.properties.ui.presentation;

 

 import java.util.ArrayList;

 import java.util.Collection;

 

 import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-

 import org.eclipse.emf.edit.domain.EditingDomain;

 import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-

 import org.eclipse.emf.edit.ui.action.ControlAction;

 import org.eclipse.emf.edit.ui.action.CreateChildAction;

 import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

 import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

 import org.eclipse.emf.edit.ui.action.LoadResourceAction;

 import org.eclipse.emf.edit.ui.action.ValidateAction;

-

 import org.eclipse.jface.action.Action;

 import org.eclipse.jface.action.ActionContributionItem;

 import org.eclipse.jface.action.IAction;

@@ -37,16 +29,13 @@ import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.action.MenuManager;

 import org.eclipse.jface.action.Separator;

 import org.eclipse.jface.action.SubContributionItem;

-

 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.ISelectionChangedListener;

 import org.eclipse.jface.viewers.ISelectionProvider;

 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.viewers.SelectionChangedEvent;

 import org.eclipse.jface.viewers.Viewer;

-

 import org.eclipse.papyrus.views.properties.environment.presentation.PropertiesEditorPlugin;

-

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.PartInitException;

 

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/ui/presentation/UiEditor.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/ui/presentation/UiEditor.java
index 437049534ec..b2e3b43bbe6 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/ui/presentation/UiEditor.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/ui/presentation/UiEditor.java
@@ -1,20 +1,14 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+/**

+ * <copyright>

+ * </copyright>

  *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

+ * $Id$

+ */

 package org.eclipse.papyrus.views.properties.ui.presentation;

 

 

 import java.io.IOException;

 import java.io.InputStream;

-

 import java.util.ArrayList;

 import java.util.Collection;

 import java.util.Collections;

@@ -33,22 +27,56 @@ import org.eclipse.core.resources.IResourceChangeListener;
 import org.eclipse.core.resources.IResourceDelta;

 import org.eclipse.core.resources.IResourceDeltaVisitor;

 import org.eclipse.core.resources.ResourcesPlugin;

-

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.core.runtime.IPath;

 import org.eclipse.core.runtime.IProgressMonitor;

 import org.eclipse.core.runtime.NullProgressMonitor;

-

+import org.eclipse.emf.common.command.BasicCommandStack;

+import org.eclipse.emf.common.command.Command;

+import org.eclipse.emf.common.command.CommandStack;

+import org.eclipse.emf.common.command.CommandStackListener;

+import org.eclipse.emf.common.notify.AdapterFactory;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.ui.MarkerHelper;

+import org.eclipse.emf.common.ui.ViewerPane;

+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

+import org.eclipse.emf.common.ui.viewer.IViewerProvider;

+import org.eclipse.emf.common.util.BasicDiagnostic;

+import org.eclipse.emf.common.util.Diagnostic;

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EValidator;

+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.resource.ResourceSet;

+import org.eclipse.emf.ecore.util.EContentAdapter;

+import org.eclipse.emf.ecore.util.EcoreUtil;

+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

+import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.emf.edit.domain.IEditingDomainProvider;

+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

+import org.eclipse.emf.edit.ui.util.EditUIUtil;

+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

 import org.eclipse.jface.action.IMenuListener;

 import org.eclipse.jface.action.IMenuManager;

 import org.eclipse.jface.action.IStatusLineManager;

 import org.eclipse.jface.action.IToolBarManager;

 import org.eclipse.jface.action.MenuManager;

 import org.eclipse.jface.action.Separator;

-

 import org.eclipse.jface.dialogs.MessageDialog;

 import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-

 import org.eclipse.jface.viewers.ColumnWeightData;

 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.ISelectionChangedListener;

@@ -62,28 +90,25 @@ import org.eclipse.jface.viewers.TableLayout;
 import org.eclipse.jface.viewers.TableViewer;

 import org.eclipse.jface.viewers.TreeViewer;

 import org.eclipse.jface.viewers.Viewer;

-

+import org.eclipse.papyrus.infra.constraints.provider.ConstraintsItemProviderAdapterFactory;

+import org.eclipse.papyrus.views.properties.contexts.provider.ContextsItemProviderAdapterFactory;

+import org.eclipse.papyrus.views.properties.environment.presentation.PropertiesEditorPlugin;

+import org.eclipse.papyrus.views.properties.environment.provider.EnvironmentItemProviderAdapterFactory;

+import org.eclipse.papyrus.views.properties.ui.provider.UiItemProviderAdapterFactory;

 import org.eclipse.swt.SWT;

-

 import org.eclipse.swt.custom.CTabFolder;

-

 import org.eclipse.swt.dnd.DND;

 import org.eclipse.swt.dnd.Transfer;

-

 import org.eclipse.swt.events.ControlAdapter;

 import org.eclipse.swt.events.ControlEvent;

-

 import org.eclipse.swt.graphics.Point;

-

 import org.eclipse.swt.layout.FillLayout;

-

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Menu;

 import org.eclipse.swt.widgets.Table;

 import org.eclipse.swt.widgets.TableColumn;

 import org.eclipse.swt.widgets.Tree;

 import org.eclipse.swt.widgets.TreeColumn;

-

 import org.eclipse.ui.IActionBars;

 import org.eclipse.ui.IEditorInput;

 import org.eclipse.ui.IEditorPart;

@@ -91,88 +116,18 @@ import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.IPartListener;

 import org.eclipse.ui.IWorkbenchPart;

 import org.eclipse.ui.PartInitException;

-

+import org.eclipse.ui.actions.WorkspaceModifyOperation;

 import org.eclipse.ui.dialogs.SaveAsDialog;

-

 import org.eclipse.ui.ide.IGotoMarker;

-

 import org.eclipse.ui.part.FileEditorInput;

 import org.eclipse.ui.part.MultiPageEditorPart;

-

 import org.eclipse.ui.views.contentoutline.ContentOutline;

 import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

 import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-

 import org.eclipse.ui.views.properties.IPropertySheetPage;

 import org.eclipse.ui.views.properties.PropertySheet;

 import org.eclipse.ui.views.properties.PropertySheetPage;

 

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.command.CommandStackListener;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.common.ui.MarkerHelper;

-import org.eclipse.emf.common.ui.ViewerPane;

-

-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

-

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.URI;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EValidator;

-

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-

-

-

-

-import org.eclipse.papyrus.views.properties.contexts.provider.ContextsItemProviderAdapterFactory;

-import org.eclipse.papyrus.views.properties.environment.presentation.PropertiesEditorPlugin;

-import org.eclipse.papyrus.views.properties.environment.provider.EnvironmentItemProviderAdapterFactory;

-import org.eclipse.papyrus.views.properties.ui.provider.UiItemProviderAdapterFactory;

-

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

 

 /**

  * This is an example of a Ui model editor.

@@ -709,6 +664,8 @@ public class UiEditor
 		adapterFactory.addAdapterFactory(new EnvironmentItemProviderAdapterFactory());

 		adapterFactory.addAdapterFactory(new ContextsItemProviderAdapterFactory());

 		adapterFactory.addAdapterFactory(new UiItemProviderAdapterFactory());

+		adapterFactory.addAdapterFactory(new ConstraintsItemProviderAdapterFactory());

+		adapterFactory.addAdapterFactory(new org.eclipse.papyrus.infra.constraints.environment.provider.EnvironmentItemProviderAdapterFactory());

 		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

 		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

 

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/ui/presentation/UiModelWizard.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/ui/presentation/UiModelWizard.java
index f17276a884a..e4226982550 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/ui/presentation/UiModelWizard.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/ui/presentation/UiModelWizard.java
@@ -1,14 +1,9 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+/**

+ * <copyright>

+ * </copyright>

  *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

+ * $Id$

+ */

 package org.eclipse.papyrus.views.properties.ui.presentation;

 

 

@@ -22,78 +17,52 @@ import java.util.Map;
 import java.util.MissingResourceException;

 import java.util.StringTokenizer;

 

+import org.eclipse.core.resources.IContainer;

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IFolder;

+import org.eclipse.core.resources.IProject;

+import org.eclipse.core.resources.IResource;

+import org.eclipse.core.resources.ResourcesPlugin;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.core.runtime.Path;

 import org.eclipse.emf.common.CommonPlugin;

-

 import org.eclipse.emf.common.util.URI;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EClassifier;

-

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.resource.Resource;

 import org.eclipse.emf.ecore.resource.ResourceSet;

-

 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-

-import org.eclipse.emf.ecore.EObject;

-

 import org.eclipse.emf.ecore.xmi.XMLResource;

-

 import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ResourcesPlugin;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-

 import org.eclipse.jface.dialogs.MessageDialog;

-

+import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.IStructuredSelection;

-

+import org.eclipse.jface.viewers.StructuredSelection;

 import org.eclipse.jface.wizard.Wizard;

 import org.eclipse.jface.wizard.WizardPage;

-

+import org.eclipse.papyrus.views.properties.environment.presentation.PropertiesEditorPlugin;

+import org.eclipse.papyrus.views.properties.environment.provider.PropertiesEditPlugin;

+import org.eclipse.papyrus.views.properties.ui.UiFactory;

+import org.eclipse.papyrus.views.properties.ui.UiPackage;

 import org.eclipse.swt.SWT;

-

-import org.eclipse.swt.events.ModifyListener;

 import org.eclipse.swt.events.ModifyEvent;

-

+import org.eclipse.swt.events.ModifyListener;

 import org.eclipse.swt.layout.GridData;

 import org.eclipse.swt.layout.GridLayout;

-

 import org.eclipse.swt.widgets.Combo;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Label;

-

 import org.eclipse.ui.INewWizard;

 import org.eclipse.ui.IWorkbench;

-

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.ISetSelectionTarget;

-

-

-

-import org.eclipse.core.runtime.Path;

-

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-

-import org.eclipse.papyrus.views.properties.environment.presentation.PropertiesEditorPlugin;

-import org.eclipse.papyrus.views.properties.environment.provider.PropertiesEditPlugin;

-import org.eclipse.papyrus.views.properties.ui.UiFactory;

-import org.eclipse.papyrus.views.properties.ui.UiPackage;

-

 import org.eclipse.ui.IWorkbenchPage;

 import org.eclipse.ui.IWorkbenchPart;

 import org.eclipse.ui.IWorkbenchWindow;

 import org.eclipse.ui.PartInitException;

+import org.eclipse.ui.actions.WorkspaceModifyOperation;

+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

+import org.eclipse.ui.part.FileEditorInput;

+import org.eclipse.ui.part.ISetSelectionTarget;

 

 

 /**