Merge branch 'bugs/386118-emf-facet'

Conflicts:
	plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/listeners/DropTargetListener.java

3 files changed, 15 insertions, 3 deletions

diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF
index 5ea0d3074be..42625a77040 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF
@@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jface,

  org.eclipse.core.expressions,

  org.eclipse.swt,

- org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.4.0"

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.0"

 Export-Package: org.eclipse.papyrus.uml.nattable,

  org.eclipse.papyrus.uml.nattable.config,

  org.eclipse.papyrus.uml.nattable.dataprovider,

diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLFeatureCellEditorConfig.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLFeatureCellEditorConfig.java
index e1d35d290b5..335aa070429 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLFeatureCellEditorConfig.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLFeatureCellEditorConfig.java
@@ -1,4 +1,4 @@
-/*****************************************************************************

+/*****************************************************************************
  * Copyright (c) 2013, 2014 CEA LIST and others.

  *

  * All rights reserved. This program and the accompanying materials

@@ -10,7 +10,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *  Christian W. Damus (CEA) - bug 402525

  *

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

+ *****************************************************************************/
 package org.eclipse.papyrus.uml.nattable.config;

 

 import org.eclipse.emf.ecore.EClassifier;

diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/messages/Messages.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/messages/Messages.java
index d8acfe53519..02b468f3bf8 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/messages/Messages.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/messages/Messages.java
@@ -1,3 +1,15 @@
+/*****************************************************************************

+ * Copyright (c) 2014 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

+ *

+ * Contributors:

+ *  Patrick Tessier (CEA LIST) - Initial API and implementation

+ /*****************************************************************************/

 package org.eclipse.papyrus.uml.nattable.messages;

 

 import org.eclipse.osgi.util.NLS;