Merge branch 'neon' of https://git.eclipse.org/r/chess/chess.git into
neon

Conflicts:
	plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/labeling/FlaDslDescriptionLabelProvider.xtend
	plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/labeling/FlaDslLabelProvider.xtend
	plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/outline/FlaDslOutlineTreeProvider.xtend
	plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/quickfix/FlaDslQuickfixProvider.xtend
	plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/GenerateFlaDsl.mwe2
	plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/formatting/FlaDslFormatter.xtend
	plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/generator/FlaDslGenerator.xtend
	plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/scoping/FlaDslScopeProvider.xtend
	plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/validation/FlaDslValidator.xtend

Change-Id: I5315768ba10a0377a053fa5244c92cb75ed528bb
diff --git a/plugins/contracts/org.polarsys.chess.contracts.chessextension/about.html b/plugins/contracts/org.polarsys.chess.contracts.chessextension/about.html
index dd3c089..164f781 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.chessextension/about.html
+++ b/plugins/contracts/org.polarsys.chess.contracts.chessextension/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>November 14, 2008</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/plugins/contracts/org.polarsys.chess.contracts.chessextension/build.properties b/plugins/contracts/org.polarsys.chess.contracts.chessextension/build.properties
index 84e3872..32a129e 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.chessextension/build.properties
+++ b/plugins/contracts/org.polarsys.chess.contracts.chessextension/build.properties
@@ -2,9 +2,9 @@
 #
 # Copyright (c) 2013, 2015 Intecs SpA 
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 # Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.chessextension/plugin.xml b/plugins/contracts/org.polarsys.chess.contracts.chessextension/plugin.xml
index e181250..9633ab5 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.chessextension/plugin.xml
+++ b/plugins/contracts/org.polarsys.chess.contracts.chessextension/plugin.xml
@@ -4,9 +4,9 @@
    
     Copyright (c) 2013, 2015 Intecs SpA 
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
    
     Contributors:
     Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/Activator.java b/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/Activator.java
index 6b4bba3..b3ca234 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/Activator.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/Activator.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/dialogs/SetContractRefinementDialog.java b/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/dialogs/SetContractRefinementDialog.java
index f7a231f..27bd44b 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/dialogs/SetContractRefinementDialog.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/dialogs/SetContractRefinementDialog.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/listeners/PapyrusModelListener.java b/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/listeners/PapyrusModelListener.java
index 0030ee5..3c2dd12 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/listeners/PapyrusModelListener.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/listeners/PapyrusModelListener.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/listeners/SelectionListener.java b/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/listeners/SelectionListener.java
index 7bfdc8a..5ab9166 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/listeners/SelectionListener.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/listeners/SelectionListener.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/managers/ApplyCHESSContractProfile.java b/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/managers/ApplyCHESSContractProfile.java
index 89274a8..0b7f5f3 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/managers/ApplyCHESSContractProfile.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/managers/ApplyCHESSContractProfile.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/managers/CHESSContractProfileManager.java b/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/managers/CHESSContractProfileManager.java
index ab60510..08de1cb 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/managers/CHESSContractProfileManager.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/managers/CHESSContractProfileManager.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/managers/PaletteManager.java b/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/managers/PaletteManager.java
index a21ef55..1639af0 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/managers/PaletteManager.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/managers/PaletteManager.java
@@ -2,9 +2,9 @@
  *

  * Copyright (c) 2013, 2015 Intecs SpA 

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  * Contributors:

  * Nicholas Pacini nicholas.pacini@intecs.it 

diff --git a/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/popup/commands/SetContractRefinement.java b/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/popup/commands/SetContractRefinement.java
index bde3624..5ac4479 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/popup/commands/SetContractRefinement.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/popup/commands/SetContractRefinement.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/propertytab/BlockEditPartSection.java b/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/propertytab/BlockEditPartSection.java
index a0aa68d..7264e85 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/propertytab/BlockEditPartSection.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/propertytab/BlockEditPartSection.java
@@ -2,9 +2,9 @@
  *

  * Copyright (c) 2013, 2017 Intecs SpA 

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  * Contributors:

  * Nicholas Pacini nicholas.pacini@intecs.it 

diff --git a/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/propertytab/BlockPropertyCompositeEditPartSection.java b/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/propertytab/BlockPropertyCompositeEditPartSection.java
index 425b85d..33be5d9 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/propertytab/BlockPropertyCompositeEditPartSection.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/propertytab/BlockPropertyCompositeEditPartSection.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.contractEditor/about.html b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorFilter.java b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorFilter.java
index 282625e..6199dc3 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorFilter.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorTab.java b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorTab.java
index 3b85090..f701564 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorTab.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorTab.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorView.java b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorView.java
index dc692ed..5333f61 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorView.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorView.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/about.html b/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/src/org/polarsys/chess/contracts/contractPropertyManager/ui/profile/listener/MessageDialog.java b/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/src/org/polarsys/chess/contracts/contractPropertyManager/ui/profile/listener/MessageDialog.java
index f63b936..18b4469 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/src/org/polarsys/chess/contracts/contractPropertyManager/ui/profile/listener/MessageDialog.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/src/org/polarsys/chess/contracts/contractPropertyManager/ui/profile/listener/MessageDialog.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/src/org/polarsys/chess/contracts/contractPropertyManager/ui/profile/listener/PapyrusListener.java b/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/src/org/polarsys/chess/contracts/contractPropertyManager/ui/profile/listener/PapyrusListener.java
index 0e6e0b9..f3b598c 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/src/org/polarsys/chess/contracts/contractPropertyManager/ui/profile/listener/PapyrusListener.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/src/org/polarsys/chess/contracts/contractPropertyManager/ui/profile/listener/PapyrusListener.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/about.html b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/listener/PapyrusListener.java b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/listener/PapyrusListener.java
index c430054..ef8f207 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/listener/PapyrusListener.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/listener/PapyrusListener.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/listener/SelectionListener.java b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/listener/SelectionListener.java
index c3bffa8..16c03a0 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/listener/SelectionListener.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/listener/SelectionListener.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSComponentNode.java b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSComponentNode.java
index 4b37085..e85b146 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSComponentNode.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSComponentNode.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSRootNode.java b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSRootNode.java
index 51d3a98..a1f6e89 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSRootNode.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSRootNode.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSSystemNode.java b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSSystemNode.java
index 5b47ce2..f5e0bbb 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSSystemNode.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSSystemNode.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/view/CustomHierarchicalView.java b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/view/CustomHierarchicalView.java
index e9221ff..2ccbbb0 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/view/CustomHierarchicalView.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/view/CustomHierarchicalView.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.integration/about.html b/plugins/contracts/org.polarsys.chess.contracts.integration/about.html
index dd3c089..164f781 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.integration/about.html
+++ b/plugins/contracts/org.polarsys.chess.contracts.integration/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>November 14, 2008</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/plugins/contracts/org.polarsys.chess.contracts.integration/build.properties b/plugins/contracts/org.polarsys.chess.contracts.integration/build.properties
index be97bef..738e52b 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.integration/build.properties
+++ b/plugins/contracts/org.polarsys.chess.contracts.integration/build.properties
@@ -2,9 +2,9 @@
 #
 # Copyright (c) 2013, 2015 Intecs SpA 
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 # Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.integration/plugin.xml b/plugins/contracts/org.polarsys.chess.contracts.integration/plugin.xml
index 70155c0..d0373e0 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.integration/plugin.xml
+++ b/plugins/contracts/org.polarsys.chess.contracts.integration/plugin.xml
@@ -4,9 +4,9 @@
    
     Copyright (c) 2013, 2015 Intecs SpA 
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
    
     Contributors:
     Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.integration/src/org/polarsys/chess/contracts/integration/Activator.java b/plugins/contracts/org.polarsys.chess.contracts.integration/src/org/polarsys/chess/contracts/integration/Activator.java
index 61e5d6b..911c4ba 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.integration/src/org/polarsys/chess/contracts/integration/Activator.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.integration/src/org/polarsys/chess/contracts/integration/Activator.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.integration/src/org/polarsys/chess/contracts/integration/InputStreamer.java b/plugins/contracts/org.polarsys.chess.contracts.integration/src/org/polarsys/chess/contracts/integration/InputStreamer.java
index 972aca5..81aa240 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.integration/src/org/polarsys/chess/contracts/integration/InputStreamer.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.integration/src/org/polarsys/chess/contracts/integration/InputStreamer.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.integration/src/org/polarsys/chess/contracts/integration/ToolIntegration.java b/plugins/contracts/org.polarsys.chess.contracts.integration/src/org/polarsys/chess/contracts/integration/ToolIntegration.java
index 4d53401..5ea4d86 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.integration/src/org/polarsys/chess/contracts/integration/ToolIntegration.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.integration/src/org/polarsys/chess/contracts/integration/ToolIntegration.java
@@ -2,9 +2,9 @@
  *

  * Copyright (c) 2013, 2015 Intecs SpA 

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  * Contributors:

  * Nicholas Pacini nicholas.pacini@intecs.it 

diff --git a/plugins/contracts/org.polarsys.chess.contracts.integration/src/org/polarsys/chess/contracts/integration/preferences/OcraAnalysisPreferencePage.java b/plugins/contracts/org.polarsys.chess.contracts.integration/src/org/polarsys/chess/contracts/integration/preferences/OcraAnalysisPreferencePage.java
index 5eed244..2b5037b 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.integration/src/org/polarsys/chess/contracts/integration/preferences/OcraAnalysisPreferencePage.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.integration/src/org/polarsys/chess/contracts/integration/preferences/OcraAnalysisPreferencePage.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.integration/src/org/polarsys/chess/contracts/integration/preferences/XsapAnalysisPreferencePage.java b/plugins/contracts/org.polarsys.chess.contracts.integration/src/org/polarsys/chess/contracts/integration/preferences/XsapAnalysisPreferencePage.java
index 86f096b..7206cec 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.integration/src/org/polarsys/chess/contracts/integration/preferences/XsapAnalysisPreferencePage.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.integration/src/org/polarsys/chess/contracts/integration/preferences/XsapAnalysisPreferencePage.java
@@ -1,31 +1,38 @@
-package org.polarsys.chess.contracts.integration.preferences;
-
-import org.eclipse.jface.preference.DirectoryFieldEditor;
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.polarsys.chess.contracts.integration.Activator;
-
-public class XsapAnalysisPreferencePage extends FieldEditorPreferencePage 
-implements IWorkbenchPreferencePage{
-	
-	public static final String XSAP_PATH = "XSAP_PATH";
-
-	public XsapAnalysisPreferencePage() {
-		super(GRID);
-	}
-
-	@Override
-	protected void createFieldEditors() {
-		DirectoryFieldEditor xsapPathDirEditor = new DirectoryFieldEditor(XSAP_PATH, "xSAP scripts directory:",
-		getFieldEditorParent());	
-		addField(xsapPathDirEditor);
-	}
-	
-	@Override
-	public void init(IWorkbench workbench) {
-		setPreferenceStore(Activator.getDefault().getPreferenceStore());
-		setDescription("Preferences page for xSAP Analysis Tool");
-	}
-
-}
+/*******************************************************************************

+ * Copyright (C) 2020 Fondazione Bruno Kessler.

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

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

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

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

+package org.polarsys.chess.contracts.integration.preferences;

+

+import org.eclipse.jface.preference.DirectoryFieldEditor;

+import org.eclipse.jface.preference.FieldEditorPreferencePage;

+import org.eclipse.ui.IWorkbench;

+import org.eclipse.ui.IWorkbenchPreferencePage;

+import org.polarsys.chess.contracts.integration.Activator;

+

+public class XsapAnalysisPreferencePage extends FieldEditorPreferencePage 

+implements IWorkbenchPreferencePage{

+	

+	public static final String XSAP_PATH = "XSAP_PATH";

+

+	public XsapAnalysisPreferencePage() {

+		super(GRID);

+	}

+

+	@Override

+	protected void createFieldEditors() {

+		DirectoryFieldEditor xsapPathDirEditor = new DirectoryFieldEditor(XSAP_PATH, "xSAP scripts directory:",

+		getFieldEditorParent());	

+		addField(xsapPathDirEditor);

+	}

+	

+	@Override

+	public void init(IWorkbench workbench) {

+		setPreferenceStore(Activator.getDefault().getPreferenceStore());

+		setDescription("Preferences page for xSAP Analysis Tool");

+	}

+

+}

diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/about.html b/plugins/contracts/org.polarsys.chess.contracts.profile/about.html
index dd3c089..164f781 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/about.html
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>November 14, 2008</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/build.properties b/plugins/contracts/org.polarsys.chess.contracts.profile/build.properties
index b3de30d..a6fa2ea 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/build.properties
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/build.properties
@@ -2,9 +2,9 @@
 #
 # Copyright (c) 2013, 2015 Intecs SpA 
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 # Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/palettes/ForeverBDD.Palette.xml b/plugins/contracts/org.polarsys.chess.contracts.profile/palettes/ForeverBDD.Palette.xml
index 0b18e37..d171286 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/palettes/ForeverBDD.Palette.xml
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/palettes/ForeverBDD.Palette.xml
@@ -3,9 +3,9 @@
    
     Copyright (c) 2013, 2015 Intecs SpA 
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
    
     Contributors:
     Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/palettes/ForeverCD.Palette.xml b/plugins/contracts/org.polarsys.chess.contracts.profile/palettes/ForeverCD.Palette.xml
index e4d1456..615b8cd 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/palettes/ForeverCD.Palette.xml
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/palettes/ForeverCD.Palette.xml
@@ -3,9 +3,9 @@
    
     Copyright (c) 2013, 2015 Intecs SpA 
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
    
     Contributors:
     Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/palettes/ForeverCSD.Palette.xml b/plugins/contracts/org.polarsys.chess.contracts.profile/palettes/ForeverCSD.Palette.xml
index f9a6aba..2b54a31 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/palettes/ForeverCSD.Palette.xml
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/palettes/ForeverCSD.Palette.xml
@@ -3,9 +3,9 @@
    
     Copyright (c) 2013, 2015 Intecs SpA 
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
    
     Contributors:
     Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/palettes/ForeverDeploymentCD.Palette.xml b/plugins/contracts/org.polarsys.chess.contracts.profile/palettes/ForeverDeploymentCD.Palette.xml
index 498e403..98f6fea 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/palettes/ForeverDeploymentCD.Palette.xml
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/palettes/ForeverDeploymentCD.Palette.xml
@@ -3,9 +3,9 @@
    
     Copyright (c) 2013, 2015 Intecs SpA 
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
    
     Contributors:
     Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/palettes/ForeverIBD.Palette.xml b/plugins/contracts/org.polarsys.chess.contracts.profile/palettes/ForeverIBD.Palette.xml
index 8a27de7..d080d91 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/palettes/ForeverIBD.Palette.xml
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/palettes/ForeverIBD.Palette.xml
@@ -3,9 +3,9 @@
    
     Copyright (c) 2013, 2015 Intecs SpA 
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
    
     Contributors:
     Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/palettes/ForeverReq.Palette.xml b/plugins/contracts/org.polarsys.chess.contracts.profile/palettes/ForeverReq.Palette.xml
index 4795b39..87cf5b9 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/palettes/ForeverReq.Palette.xml
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/palettes/ForeverReq.Palette.xml
@@ -3,9 +3,9 @@
    
     Copyright (c) 2013, 2015 Intecs SpA 
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
    
     Contributors:
     Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/plugin.properties b/plugins/contracts/org.polarsys.chess.contracts.profile/plugin.properties
index 07e9dae..12feb24 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/plugin.properties
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/plugin.properties
@@ -2,9 +2,9 @@
 #
 # Copyright (c) 2013, 2015 Intecs SpA 
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 # Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/plugin.xml b/plugins/contracts/org.polarsys.chess.contracts.profile/plugin.xml
index 28ff49a..e2eba5f 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/plugin.xml
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/plugin.xml
@@ -5,9 +5,9 @@
    
     Copyright (c) 2013, 2015 Intecs SpA 
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
    
     Contributors:
     Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/Activator.java b/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/Activator.java
index c2b38eb..32f4475 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/Activator.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/Activator.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/Constants.java b/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/Constants.java
index 4054243..768a05a 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/Constants.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/Constants.java
@@ -1,9 +1,16 @@
-package org.polarsys.chess.contracts.profile.chesscontract.util;
-
-public class Constants {
-	public static String ContractRefinementAnalysis = "CHESSContract::ContractRefinementAnalysisContext";
-	public static final String CONTRACT = "CHESSContract::Contract";
-	public static final String CONTRACT_PROP = "CHESSContract::ContractProperty";
-	public static final String DELEGATION_CONST = "CHESSContract::DelegationConstraint";
-	public static final String FORMAL_PROP = "CHESSContract::FormalProperty";
-}
+/*******************************************************************************

+ * Copyright (C) 2020 Fondazione Bruno Kessler.

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

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

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

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

+package org.polarsys.chess.contracts.profile.chesscontract.util;

+

+public class Constants {

+	public static String ContractRefinementAnalysis = "CHESSContract::ContractRefinementAnalysisContext";

+	public static final String CONTRACT = "CHESSContract::Contract";

+	public static final String CONTRACT_PROP = "CHESSContract::ContractProperty";

+	public static final String DELEGATION_CONST = "CHESSContract::DelegationConstraint";

+	public static final String FORMAL_PROP = "CHESSContract::FormalProperty";

+}

diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/ContractEntityUtil.java b/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/ContractEntityUtil.java
index 59885f1..ed54d9b 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/ContractEntityUtil.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/ContractEntityUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/EntityUtil.java b/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/EntityUtil.java
index e165db0..f79e68a 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/EntityUtil.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/EntityUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2017 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     Alberto Debiasi - initial API and implementation
diff --git a/plugins/contracts/org.polarsys.chess.contracts.refinementView/about.html b/plugins/contracts/org.polarsys.chess.contracts.refinementView/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.refinementView/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/listener/PapyrusListener.java b/plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/listener/PapyrusListener.java
index 2a30bd8..16f5a0f 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/listener/PapyrusListener.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/listener/PapyrusListener.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/listener/SelectionListener.java b/plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/listener/SelectionListener.java
index 230b792..c317a58 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/listener/SelectionListener.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/listener/SelectionListener.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/treeElements/CHESSContractNode.java b/plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/treeElements/CHESSContractNode.java
index 65c75f8..f5e4554 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/treeElements/CHESSContractNode.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/treeElements/CHESSContractNode.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/treeElements/CHESSRootNode.java b/plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/treeElements/CHESSRootNode.java
index 2277718..e961d69 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/treeElements/CHESSRootNode.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/treeElements/CHESSRootNode.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/view/CustomRefinementView.java b/plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/view/CustomRefinementView.java
index 567e721..de603d8 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/view/CustomRefinementView.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/view/CustomRefinementView.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/about.html b/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/src/org/polarsys/chess/safetyAnalysis/commands/ComputeContractFaultTreeCommand.java b/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/src/org/polarsys/chess/safetyAnalysis/commands/ComputeContractFaultTreeCommand.java
index d9db66a..a5a3b6f 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/src/org/polarsys/chess/safetyAnalysis/commands/ComputeContractFaultTreeCommand.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/src/org/polarsys/chess/safetyAnalysis/commands/ComputeContractFaultTreeCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/src/org/polarsys/chess/safetyAnalysis/commands/debug/ComputeContractFaultTreeOnFileCommand.java b/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/src/org/polarsys/chess/safetyAnalysis/commands/debug/ComputeContractFaultTreeOnFileCommand.java
index 0360a40..fc3d14e 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/src/org/polarsys/chess/safetyAnalysis/commands/debug/ComputeContractFaultTreeOnFileCommand.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/src/org/polarsys/chess/safetyAnalysis/commands/debug/ComputeContractFaultTreeOnFileCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/about.html b/plugins/contracts/org.polarsys.chess.contracts.transformations/about.html
index dd3c089..164f781 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/about.html
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>November 14, 2008</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/build.properties b/plugins/contracts/org.polarsys.chess.contracts.transformations/build.properties
index 6cd763b..d986645 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/build.properties
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/build.properties
@@ -2,9 +2,9 @@
 #
 # Copyright (c) 2013, 2015 Intecs SpA 
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 # Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/plugin.properties b/plugins/contracts/org.polarsys.chess.contracts.transformations/plugin.properties
index bcea85c..176b094 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/plugin.properties
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/plugin.properties
@@ -2,9 +2,9 @@
 #
 # Copyright (c) 2013, 2015 Intecs SpA 
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 # Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/plugin.xml b/plugins/contracts/org.polarsys.chess.contracts.transformations/plugin.xml
index 5a123a7..da3dd58 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/plugin.xml
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/plugin.xml
@@ -4,9 +4,9 @@
    

     Copyright (c) 2013, 2015 Intecs SpA 

     All rights reserved. This program and the accompanying materials

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

+    are made available under the terms of the Eclipse Public License v2.0

     which accompanies this distribution, and is available at

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

+    http://www.eclipse.org/legal/epl-v20.html

    

     Contributors:

     Nicholas Pacini nicholas.pacini@intecs.it 

diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/Activator.java b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/Activator.java
index 50524f0..906a2a4 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/Activator.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/Activator.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/AbstractXSapHandler.java b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/AbstractXSapHandler.java
index 8b47888..2adb472 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/AbstractXSapHandler.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/AbstractXSapHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CHESSContractValidateAndRefineCommand.java b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CHESSContractValidateAndRefineCommand.java
index f9532bd..aae1c7a 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CHESSContractValidateAndRefineCommand.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CHESSContractValidateAndRefineCommand.java
@@ -2,9 +2,9 @@
  *

  * Copyright (c) 2013, 2015 Intecs SpA 

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  * Contributors:

  * Nicholas Pacini nicholas.pacini@intecs.it 

diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CHESSContractValidatePropertyCommand.java b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CHESSContractValidatePropertyCommand.java
index 2ff12fd..fff32bf 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CHESSContractValidatePropertyCommand.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CHESSContractValidatePropertyCommand.java
@@ -2,9 +2,9 @@
  *

  * Copyright (c) 2013, 2015 Intecs SpA 

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  * Contributors:

  * Nicholas Pacini nicholas.pacini@intecs.it 

diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CHESSContractValidatePropertyHandler.java b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CHESSContractValidatePropertyHandler.java
index 9e3cd49..ba66084 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CHESSContractValidatePropertyHandler.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CHESSContractValidatePropertyHandler.java
@@ -2,9 +2,9 @@
  *

  * Copyright (c) 2013, 2015 Intecs SpA 

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  * Contributors:

  * Nicholas Pacini nicholas.pacini@intecs.it 

diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CHESSContractValidationAndRefinementHandler.java b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CHESSContractValidationAndRefinementHandler.java
index 4748967..f242b6f 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CHESSContractValidationAndRefinementHandler.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CHESSContractValidationAndRefinementHandler.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CheckImplHandler.java b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CheckImplHandler.java
index 080e119..59fb17d 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CheckImplHandler.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CheckImplHandler.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CheckRefHandler.java b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CheckRefHandler.java
index f8ab546..8648c16 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CheckRefHandler.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CheckRefHandler.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CheckValidPropHandler.java b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CheckValidPropHandler.java
index 25ea0ed..74db65c 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CheckValidPropHandler.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CheckValidPropHandler.java
@@ -2,9 +2,9 @@
  *

  * Copyright (c) 2013, 2015 Intecs SpA 

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  * Contributors:

  * Nicholas Pacini nicholas.pacini@intecs.it 

diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CommandsCommon.java b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CommandsCommon.java
index 6bb6802..405cf83 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CommandsCommon.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CommandsCommon.java
@@ -2,9 +2,9 @@
  *

  * Copyright (c) 2013, 2015 Intecs SpA 

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  * Contributors:

  * Nicholas Pacini nicholas.pacini@intecs.it 

diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/ExportSmv.java b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/ExportSmv.java
index de74451..01c0c70 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/ExportSmv.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/ExportSmv.java
@@ -1,133 +1,140 @@
-package org.polarsys.chess.contracts.transformations.commands;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ITreeSelection;
-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EObjectTreeElement;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.ISelectionService;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Package;
-import org.polarsys.chess.chessmlprofile.ComponentModel.ComponentType;
-import org.polarsys.chess.contracts.transformations.main.GenerateErrorModel;
-import org.polarsys.chess.core.notifications.ResourceNotification;
-import org.polarsys.chess.core.profiles.CHESSProfileManager;
-import org.polarsys.chess.core.util.uml.UMLUtils;
-import org.polarsys.chess.core.views.ViewUtils;
-
-public class ExportSmv extends AbstractHandler{
-
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-
-		IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event);
-		final Shell activeShell = window.getShell();
-
-		final Class selected = getSelection(window);
-		if(selected != null){
-
-			FileDialog dialog = new FileDialog(activeShell,SWT.SAVE);
-			dialog.setFilterNames(new String[] { "SMV" });
-			dialog.setFilterExtensions(new String[] { "*.smv" }); 
-	                                   
-			String dir = dialog.open();
-			if(dir != null){
-				final File targetDir = (new File(dialog.getFilterPath()));
-
-				String systemQN = selected.getQualifiedName();
-				final List<String> args = new ArrayList<String>();
-				args.add(systemQN);
-				String systemName = systemQN.substring(systemQN.lastIndexOf("::")+2);
-				args.add(systemName);
-				args.add(dialog.getFileName().replaceFirst(".smv", ""));
-
-				Job job = new Job("Exporting to SMV"){
-
-					@Override
-					protected IStatus run(IProgressMonitor monitor) {
-
-						monitor.beginTask("operation in progress ...", 3);
-						try{
-							monitor.subTask("transforming...");
-
-							GenerateErrorModel gen = new GenerateErrorModel(selected, targetDir, args);
-							gen.doGenerate(null);
-							monitor.worked(1);
-
-						}catch (IOException e) {
-							e.printStackTrace();
-						} 
-						monitor.done();
-						if (monitor.isCanceled())
-							return Status.CANCEL_STATUS;
-						return Status.OK_STATUS;
-					}
-				};
-
-				job.setUser(true);
-				job.setPriority(Job.SHORT);
-				job.schedule();
-			}else{
-				return null;
-			}
-		}
-		ResourceNotification.showOk("Element exported correctly");
-		return null;
-
-	}
-
-	private Class getSelection(IWorkbenchWindow window ) {
-		ISelectionService selectionService = window.getSelectionService();
-		ISelection selectionX = selectionService.getSelection();
-		if (!(selectionX instanceof ITreeSelection)){
-			ResourceNotification.showOk("Selection not valid: select a single resource on the ModelExplorer");
-			return null;
-		}
-		ITreeSelection treesel = (ITreeSelection)selectionX;
-		if (treesel.getPaths().length == 0 ||  treesel.getPaths().length > 1){
-			ResourceNotification.showError("Selection not valid: select a single resource on the ModelExplorer");
-			return null;
-		}
-
-		Object obj = treesel.getFirstElement();
-		if (!(obj instanceof EObjectTreeElement)){
-			ResourceNotification.showError("Selection not valid: select a single resource on the ModelExplorer");
-		}
-		EObject eobj = ((EObjectTreeElement) obj).getEObject();
-		final Package view = ViewUtils.getView(eobj);
-
-		//		final Model umlModel = view.getModel();
-		final Class umlClass = (Class) eobj;
-
-		if (!ViewUtils.isDesignView(view, CHESSProfileManager.SYSTEM_VIEW) &&
-				!ViewUtils.isDesignView(view, CHESSProfileManager.COMPONENT_VIEW)) {
-			ResourceNotification.showError("Selection not valid: please select a resource of the SystemView or of the ComponentView");
-			return null;
-		}
-
-		if (ViewUtils.isDesignView(view, CHESSProfileManager.COMPONENT_VIEW)){
-			if (UMLUtils.getStereotypeApplication(umlClass, ComponentType.class)!= null){
-				ResourceNotification.showError("Selection not valid: ComponentType");
-				return null;
-			}
-		}
-
-		return umlClass;
-	}
-
-}
+/*******************************************************************************

+ * Copyright (C) 2020 Fondazione Bruno Kessler.

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

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

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

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

+package org.polarsys.chess.contracts.transformations.commands;

+

+import java.io.File;

+import java.io.IOException;

+import java.util.ArrayList;

+import java.util.List;

+

+import org.eclipse.core.commands.AbstractHandler;

+import org.eclipse.core.commands.ExecutionEvent;

+import org.eclipse.core.commands.ExecutionException;

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

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

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

+import org.eclipse.core.runtime.jobs.Job;

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

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

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

+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EObjectTreeElement;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.widgets.FileDialog;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.ui.ISelectionService;

+import org.eclipse.ui.IWorkbenchWindow;

+import org.eclipse.ui.handlers.HandlerUtil;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.Package;

+import org.polarsys.chess.chessmlprofile.ComponentModel.ComponentType;

+import org.polarsys.chess.contracts.transformations.main.GenerateErrorModel;

+import org.polarsys.chess.core.notifications.ResourceNotification;

+import org.polarsys.chess.core.profiles.CHESSProfileManager;

+import org.polarsys.chess.core.util.uml.UMLUtils;

+import org.polarsys.chess.core.views.ViewUtils;

+

+public class ExportSmv extends AbstractHandler{

+

+	public Object execute(ExecutionEvent event) throws ExecutionException {

+

+		IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event);

+		final Shell activeShell = window.getShell();

+

+		final Class selected = getSelection(window);

+		if(selected != null){

+

+			FileDialog dialog = new FileDialog(activeShell,SWT.SAVE);

+			dialog.setFilterNames(new String[] { "SMV" });

+			dialog.setFilterExtensions(new String[] { "*.smv" }); 

+	                                   

+			String dir = dialog.open();

+			if(dir != null){

+				final File targetDir = (new File(dialog.getFilterPath()));

+

+				String systemQN = selected.getQualifiedName();

+				final List<String> args = new ArrayList<String>();

+				args.add(systemQN);

+				String systemName = systemQN.substring(systemQN.lastIndexOf("::")+2);

+				args.add(systemName);

+				args.add(dialog.getFileName().replaceFirst(".smv", ""));

+

+				Job job = new Job("Exporting to SMV"){

+

+					@Override

+					protected IStatus run(IProgressMonitor monitor) {

+

+						monitor.beginTask("operation in progress ...", 3);

+						try{

+							monitor.subTask("transforming...");

+

+							GenerateErrorModel gen = new GenerateErrorModel(selected, targetDir, args);

+							gen.doGenerate(null);

+							monitor.worked(1);

+

+						}catch (IOException e) {

+							e.printStackTrace();

+						} 

+						monitor.done();

+						if (monitor.isCanceled())

+							return Status.CANCEL_STATUS;

+						return Status.OK_STATUS;

+					}

+				};

+

+				job.setUser(true);

+				job.setPriority(Job.SHORT);

+				job.schedule();

+			}else{

+				return null;

+			}

+		}

+		ResourceNotification.showOk("Element exported correctly");

+		return null;

+

+	}

+

+	private Class getSelection(IWorkbenchWindow window ) {

+		ISelectionService selectionService = window.getSelectionService();

+		ISelection selectionX = selectionService.getSelection();

+		if (!(selectionX instanceof ITreeSelection)){

+			ResourceNotification.showOk("Selection not valid: select a single resource on the ModelExplorer");

+			return null;

+		}

+		ITreeSelection treesel = (ITreeSelection)selectionX;

+		if (treesel.getPaths().length == 0 ||  treesel.getPaths().length > 1){

+			ResourceNotification.showError("Selection not valid: select a single resource on the ModelExplorer");

+			return null;

+		}

+

+		Object obj = treesel.getFirstElement();

+		if (!(obj instanceof EObjectTreeElement)){

+			ResourceNotification.showError("Selection not valid: select a single resource on the ModelExplorer");

+		}

+		EObject eobj = ((EObjectTreeElement) obj).getEObject();

+		final Package view = ViewUtils.getView(eobj);

+

+		//		final Model umlModel = view.getModel();

+		final Class umlClass = (Class) eobj;

+

+		if (!ViewUtils.isDesignView(view, CHESSProfileManager.SYSTEM_VIEW) &&

+				!ViewUtils.isDesignView(view, CHESSProfileManager.COMPONENT_VIEW)) {

+			ResourceNotification.showError("Selection not valid: please select a resource of the SystemView or of the ComponentView");

+			return null;

+		}

+

+		if (ViewUtils.isDesignView(view, CHESSProfileManager.COMPONENT_VIEW)){

+			if (UMLUtils.getStereotypeApplication(umlClass, ComponentType.class)!= null){

+				ResourceNotification.showError("Selection not valid: ComponentType");

+				return null;

+			}

+		}

+

+		return umlClass;

+	}

+

+}

diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/FMEAXSapHandler.java b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/FMEAXSapHandler.java
index 7b98428..1f7469a 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/FMEAXSapHandler.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/FMEAXSapHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/FTANuSMV3Handler.java b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/FTANuSMV3Handler.java
index cbfeab3..8e7e628 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/FTANuSMV3Handler.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/FTANuSMV3Handler.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/FTAXSapHandler.java b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/FTAXSapHandler.java
index 9115909..67036a5 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/FTAXSapHandler.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/FTAXSapHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/dialogs/RefinementResultDialog.java b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/dialogs/RefinementResultDialog.java
index 8fb7cd8..dd28767 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/dialogs/RefinementResultDialog.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/dialogs/RefinementResultDialog.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/dialogs/SelectAnalysisCtxDialog.java b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/dialogs/SelectAnalysisCtxDialog.java
index ce039f7..2f08785 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/dialogs/SelectAnalysisCtxDialog.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/dialogs/SelectAnalysisCtxDialog.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/dialogs/SelectFTAFMEAAnalysisCtxDialog.java b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/dialogs/SelectFTAFMEAAnalysisCtxDialog.java
index 61ea398..26ceb5c 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/dialogs/SelectFTAFMEAAnalysisCtxDialog.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/dialogs/SelectFTAFMEAAnalysisCtxDialog.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/dialogs/SelectImplementationDialog.java b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/dialogs/SelectImplementationDialog.java
index e8f53f9..f2eea78 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/dialogs/SelectImplementationDialog.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/dialogs/SelectImplementationDialog.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/dialogs/SelectOcraAnalysisCtxDialog.java b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/dialogs/SelectOcraAnalysisCtxDialog.java
index 8cf2c81..7f9d710 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/dialogs/SelectOcraAnalysisCtxDialog.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/dialogs/SelectOcraAnalysisCtxDialog.java
@@ -2,9 +2,9 @@
  *

  * Copyright (c) 2013, 2015 Intecs SpA 

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  * Contributors:

  * Nicholas Pacini nicholas.pacini@intecs.it 

diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/dialogs/SelectSystemDialog.java b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/dialogs/SelectSystemDialog.java
index 775921b..ba39f79 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/dialogs/SelectSystemDialog.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/dialogs/SelectSystemDialog.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/Generate.java b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/Generate.java
index 529fad8..31c236c 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/Generate.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/Generate.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/GenerateErrorModel.java b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/GenerateErrorModel.java
index 79bc3d3..4dcdb6b 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/GenerateErrorModel.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/GenerateErrorModel.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/GenerateFaultExtensions.java b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/GenerateFaultExtensions.java
index 2d6c71b..cd89069 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/GenerateFaultExtensions.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/GenerateFaultExtensions.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/GenerateImplementation.java b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/GenerateImplementation.java
index 236ce41..9a509ae 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/GenerateImplementation.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/GenerateImplementation.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/generate.mtl b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/generate.mtl
index 9c94104..4d52c03 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/generate.mtl
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/generate.mtl
@@ -3,9 +3,9 @@
 /*****************************************************************************

  * Copyright (c) 2013 Intecs SpA 

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  * Nicholas Pacini nicholas.pacini@intecs.it 

diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/generateErrorModel.mtl b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/generateErrorModel.mtl
index 8073215..37ddef0 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/generateErrorModel.mtl
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/generateErrorModel.mtl
@@ -3,9 +3,9 @@
 /*****************************************************************************
  * Copyright (c) 2013 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/generateFaultExtensions.mtl b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/generateFaultExtensions.mtl
index 161f159..e449f64 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/generateFaultExtensions.mtl
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/generateFaultExtensions.mtl
@@ -3,9 +3,9 @@
 /*****************************************************************************
  * Copyright (c) 2013 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/generateImplementation.mtl b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/generateImplementation.mtl
index e982798..f4b4461 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/generateImplementation.mtl
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/main/generateImplementation.mtl
@@ -3,9 +3,9 @@
 /*****************************************************************************
  * Copyright (c) 2013 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/service/Service.java b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/service/Service.java
index 960cf97..7c26a6e 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/service/Service.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/service/Service.java
@@ -2,9 +2,9 @@
  *

  * Copyright (c) 2013, 2015 Intecs SpA 

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  * Contributors:

  * Nicholas Pacini nicholas.pacini@intecs.it 

diff --git a/plugins/contracts/org.polarsys.chess.contracts.validation/about.html b/plugins/contracts/org.polarsys.chess.contracts.validation/about.html
index dd3c089..164f781 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.validation/about.html
+++ b/plugins/contracts/org.polarsys.chess.contracts.validation/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>November 14, 2008</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/plugins/contracts/org.polarsys.chess.contracts.validation/build.properties b/plugins/contracts/org.polarsys.chess.contracts.validation/build.properties
index 84e3872..32a129e 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.validation/build.properties
+++ b/plugins/contracts/org.polarsys.chess.contracts.validation/build.properties
@@ -2,9 +2,9 @@
 #
 # Copyright (c) 2013, 2015 Intecs SpA 
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 # Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.validation/plugin.xml b/plugins/contracts/org.polarsys.chess.contracts.validation/plugin.xml
index dde0352..4936109 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.validation/plugin.xml
+++ b/plugins/contracts/org.polarsys.chess.contracts.validation/plugin.xml
@@ -4,9 +4,9 @@
    
     Copyright (c) 2013, 2015 Intecs SpA 
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
    
     Contributors:
     Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.validation/src/org/polarsys/chess/contracts/validation/Activator.java b/plugins/contracts/org.polarsys.chess.contracts.validation/src/org/polarsys/chess/contracts/validation/Activator.java
index 1192fa4..9cd1178 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.validation/src/org/polarsys/chess/contracts/validation/Activator.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.validation/src/org/polarsys/chess/contracts/validation/Activator.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.validation/src/org/polarsys/chess/contracts/validation/CHESSContractValidationHandler.java b/plugins/contracts/org.polarsys.chess.contracts.validation/src/org/polarsys/chess/contracts/validation/CHESSContractValidationHandler.java
index 2398ba2..91411fe 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.validation/src/org/polarsys/chess/contracts/validation/CHESSContractValidationHandler.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.validation/src/org/polarsys/chess/contracts/validation/CHESSContractValidationHandler.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.validation/src/org/polarsys/chess/contracts/validation/ValidationDelegateClientSelector.java b/plugins/contracts/org.polarsys.chess.contracts.validation/src/org/polarsys/chess/contracts/validation/ValidationDelegateClientSelector.java
index 15417ef..a88e67b 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.validation/src/org/polarsys/chess/contracts/validation/ValidationDelegateClientSelector.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.validation/src/org/polarsys/chess/contracts/validation/ValidationDelegateClientSelector.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.validation/src/org/polarsys/chess/contracts/validation/command/CHESSContractValidateCommand.java b/plugins/contracts/org.polarsys.chess.contracts.validation/src/org/polarsys/chess/contracts/validation/command/CHESSContractValidateCommand.java
index c4b90f0..7e9b9a5 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.validation/src/org/polarsys/chess/contracts/validation/command/CHESSContractValidateCommand.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.validation/src/org/polarsys/chess/contracts/validation/command/CHESSContractValidateCommand.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.validation/src/org/polarsys/chess/contracts/validation/constraints/OCRAConstraints.java b/plugins/contracts/org.polarsys.chess.contracts.validation/src/org/polarsys/chess/contracts/validation/constraints/OCRAConstraints.java
index ecb91cc..0408e85 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.validation/src/org/polarsys/chess/contracts/validation/constraints/OCRAConstraints.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.validation/src/org/polarsys/chess/contracts/validation/constraints/OCRAConstraints.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2013, 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Nicholas Pacini nicholas.pacini@intecs.it 
diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/about.html b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/log4j.properties b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/log4j.properties
index 8f19ebd..5cabcd5 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/log4j.properties
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/log4j.properties
@@ -2,9 +2,9 @@
 # /*******************************************************************************

 #  * Copyright (C) 2017 Fondazione Bruno Kessler.

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

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

+#  * are made available under the terms of the Eclipse Public License v2.0

 #  * which accompanies this distribution, and is available at

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

+#  * http://www.eclipse.org/legal/epl-v20.html

 #  * 

 #  * Contributors:

 #  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/commands/ModelCheckingTest.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/commands/ModelCheckingTest.java
index 8cb3fd2..51b6482 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/commands/ModelCheckingTest.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/commands/ModelCheckingTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2018 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *  

  * Contributors:

  *   Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/AllTests.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/AllTests.java
index a7be1d0..15adac3 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/AllTests.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/AllTests.java
@@ -1,14 +1,21 @@
-package org.polarsys.chess.contracts.verificationService.test.runtime.tests;
-
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
-@RunWith(Suite.class)
-@SuiteClasses({
-	TestBasicOperations.class, TestBasicOperationsHeadless.class, TestSafetyAnalysisOperations.class, TestVAndVOperations.class
-,TestVandVOperationsOSLC.class	
-})
-public class AllTests {
-}
+/*******************************************************************************

+ * Copyright (C) 2020 Fondazione Bruno Kessler.

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

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

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

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

+package org.polarsys.chess.contracts.verificationService.test.runtime.tests;

+

+

+import org.junit.runner.RunWith;

+import org.junit.runners.Suite;

+import org.junit.runners.Suite.SuiteClasses;

+

+@RunWith(Suite.class)

+@SuiteClasses({

+	TestBasicOperations.class, TestBasicOperationsHeadless.class, TestSafetyAnalysisOperations.class, TestVAndVOperations.class

+,TestVandVOperationsOSLC.class	

+})

+public class AllTests {

+}

diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestApplyCHESSStereotype.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestApplyCHESSStereotype.java
index 4c50451..a7cf32e 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestApplyCHESSStereotype.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestApplyCHESSStereotype.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Intecs.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Nicholas Pacini
diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestApplyRecursively.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestApplyRecursively.java
index 9d53f74..e93da26 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestApplyRecursively.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestApplyRecursively.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Intecs.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Nicholas Pacini
diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestBasicOperations.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestBasicOperations.java
index 322096c..95dc054 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestBasicOperations.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestBasicOperations.java
@@ -1,3 +1,10 @@
+/*******************************************************************************

+ * Copyright (C) 2020 Fondazione Bruno Kessler.

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

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

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

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

 package org.polarsys.chess.contracts.verificationService.test.runtime.tests;

 

 import java.io.File;

diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestBasicOperationsHeadless.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestBasicOperationsHeadless.java
index ad21574..c1e3828 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestBasicOperationsHeadless.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestBasicOperationsHeadless.java
@@ -1,3 +1,10 @@
+/*******************************************************************************

+ * Copyright (C) 2020 Fondazione Bruno Kessler.

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

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

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

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

 package org.polarsys.chess.contracts.verificationService.test.runtime.tests;

 

 import java.io.File;

diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestCheckContractRefinementOfCHESSComponent.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestCheckContractRefinementOfCHESSComponent.java
index 8530ab8..626a7ec 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestCheckContractRefinementOfCHESSComponent.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestCheckContractRefinementOfCHESSComponent.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2018 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *  

  * Contributors:

  *   Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestCreateViews.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestCreateViews.java
index 1979807..fb34021 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestCreateViews.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestCreateViews.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Intecs.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Nicholas Pacini
diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestModelChecking.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestModelChecking.java
index 103ec09..8506e73 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestModelChecking.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestModelChecking.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2018 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *  

  * Contributors:

  *   Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestSafetyAnalysisOperations.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestSafetyAnalysisOperations.java
index 42d7f7d..015c8bc 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestSafetyAnalysisOperations.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestSafetyAnalysisOperations.java
@@ -1,3 +1,10 @@
+/*******************************************************************************

+ * Copyright (C) 2020 Fondazione Bruno Kessler.

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

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

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

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

 package org.polarsys.chess.contracts.verificationService.test.runtime.tests;

 

 import java.io.File;

diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestVAndVOperations.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestVAndVOperations.java
index 6c5e981..ad3b2a8 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestVAndVOperations.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestVAndVOperations.java
@@ -1,3 +1,10 @@
+/*******************************************************************************

+ * Copyright (C) 2020 Fondazione Bruno Kessler.

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

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

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

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

 package org.polarsys.chess.contracts.verificationService.test.runtime.tests;

 

 import java.io.File;

diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestVandVOperationsOSLC.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestVandVOperationsOSLC.java
index 93d673a..3e3f0d2 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestVandVOperationsOSLC.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestVandVOperationsOSLC.java
@@ -1,3 +1,10 @@
+/*******************************************************************************

+ * Copyright (C) 2020 Fondazione Bruno Kessler.

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

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

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

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

 package org.polarsys.chess.contracts.verificationService.test.runtime.tests;

 

 import org.eclipse.lyo.client.oslc.OSLCConstants;

diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/util/TestResultsUtil.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/util/TestResultsUtil.java
index 1d0a530..f5ba6db 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/util/TestResultsUtil.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/util/TestResultsUtil.java
@@ -1,3 +1,10 @@
+/*******************************************************************************

+ * Copyright (C) 2020 Fondazione Bruno Kessler.

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

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

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

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

 package org.polarsys.chess.contracts.verificationService.test.runtime.util;

 

 import java.io.BufferedReader;

diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/util/TestUtil.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/util/TestUtil.java
index 9d09ea3..3a3135e 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/util/TestUtil.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/util/TestUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2018 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *  

  * Contributors:

  *   Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService/about.html b/plugins/contracts/org.polarsys.chess.contracts.verificationService/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/CheckValidationAssertionPropertyCommand.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/CheckValidationAssertionPropertyCommand.java
index 8dd6794..cb05a80 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/CheckValidationAssertionPropertyCommand.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/CheckValidationAssertionPropertyCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/CheckValidationContractPropertyCommand.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/CheckValidationContractPropertyCommand.java
index 5883db6..988fa60 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/CheckValidationContractPropertyCommand.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/CheckValidationContractPropertyCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/CompositeContractImplementationCommand.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/CompositeContractImplementationCommand.java
index c4895f2..fdab923 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/CompositeContractImplementationCommand.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/CompositeContractImplementationCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2018 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *  

  * Contributors:

  *   Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/ContractImplementationCommand.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/ContractImplementationCommand.java
index 22d16b7..8ace9d1 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/ContractImplementationCommand.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/ContractImplementationCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/ContractRefinementCommand.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/ContractRefinementCommand.java
index abec690..f21037c 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/ContractRefinementCommand.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/ContractRefinementCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/ExportModelToFileCommand.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/ExportModelToFileCommand.java
index 8d9f54f..7d495e6 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/ExportModelToFileCommand.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/ExportModelToFileCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/ModelCheckingCommand.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/ModelCheckingCommand.java
index 236e0b4..0dd7d5a 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/ModelCheckingCommand.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/ModelCheckingCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/debug/CheckValidationPropertyOnFileCommand.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/debug/CheckValidationPropertyOnFileCommand.java
index 6d73e2b..18cd4fe 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/debug/CheckValidationPropertyOnFileCommand.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/debug/CheckValidationPropertyOnFileCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/debug/ContractImplementationOnFileCommand.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/debug/ContractImplementationOnFileCommand.java
index 6ca251e..0063c61 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/debug/ContractImplementationOnFileCommand.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/debug/ContractImplementationOnFileCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/debug/ContractRefinementOnFileCommand.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/debug/ContractRefinementOnFileCommand.java
index 705a9e6..41de886 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/debug/ContractRefinementOnFileCommand.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/debug/ContractRefinementOnFileCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/debug/ModelCheckingOnFileCommand.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/debug/ModelCheckingOnFileCommand.java
index 2f51a28..cb72b6b 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/debug/ModelCheckingOnFileCommand.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/debug/ModelCheckingOnFileCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/debug/RuntimeErrorsOnOSSFileCommand.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/debug/RuntimeErrorsOnOSSFileCommand.java
index bbf5ea5..984b61e 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/debug/RuntimeErrorsOnOSSFileCommand.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/debug/RuntimeErrorsOnOSSFileCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/debug/RuntimeErrorsOnSMVFileCommand.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/debug/RuntimeErrorsOnSMVFileCommand.java
index 4d67a77..e63b39d 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/debug/RuntimeErrorsOnSMVFileCommand.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/commands/debug/RuntimeErrorsOnSMVFileCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/services/ExecCommandService.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/services/ExecCommandService.java
index 16088e3..e5b97c0 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/services/ExecCommandService.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/ui/services/ExecCommandService.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2018 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *  

  * Contributors:

  *   Alberto Debiasi - initial API and implementation

diff --git a/plugins/fla/org.polarsys.chess.fla.FPTC2FLABehavior/about.html b/plugins/fla/org.polarsys.chess.fla.FPTC2FLABehavior/about.html
index 2091030..164f781 100644
--- a/plugins/fla/org.polarsys.chess.fla.FPTC2FLABehavior/about.html
+++ b/plugins/fla/org.polarsys.chess.fla.FPTC2FLABehavior/about.html
@@ -1,28 +1,36 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/fla/org.polarsys.chess.fla.faultTreeGenerator/about.html b/plugins/fla/org.polarsys.chess.fla.faultTreeGenerator/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.fla.faultTreeGenerator/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/fla/org.polarsys.chess.fla.feature/about.html b/plugins/fla/org.polarsys.chess.fla.feature/about.html
index 2091030..164f781 100644
--- a/plugins/fla/org.polarsys.chess.fla.feature/about.html
+++ b/plugins/fla/org.polarsys.chess.fla.feature/about.html
@@ -1,28 +1,36 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/about.html b/plugins/fla/org.polarsys.chess.fla.flamm/about.html
index 2091030..164f781 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/about.html
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/about.html
@@ -1,28 +1,36 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/build.properties b/plugins/fla/org.polarsys.chess.fla.flamm/build.properties
index f69ac01..7e81b13 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/build.properties
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/build.properties
@@ -8,7 +8,7 @@
 #  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

+#  http://www.eclipse.org/legal/epl-v20.html

 ###############################################################################

 #

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/plugin.properties b/plugins/fla/org.polarsys.chess.fla.flamm/plugin.properties
index c302312..d83ca0f 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/plugin.properties
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/plugin.properties
@@ -8,7 +8,7 @@
 #  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

+#  http://www.eclipse.org/legal/epl-v20.html

 ###############################################################################

 #

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/ACIDavoidable.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/ACIDavoidable.java
index 557881b..d762e84 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/ACIDavoidable.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/ACIDavoidable.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/ACIDmitigation.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/ACIDmitigation.java
index f003516..1d22ff5 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/ACIDmitigation.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/ACIDmitigation.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/Component.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/Component.java
index 564f63a..1dfc568 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/Component.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/Component.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/CompositeComponent.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/CompositeComponent.java
index 344ea19..b6b6d82 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/CompositeComponent.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/CompositeComponent.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/Connection.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/Connection.java
index bb56e8f..622681c 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/Connection.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/Connection.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/Expression.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/Expression.java
index 360fcae..b5ae0f0 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/Expression.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/Expression.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/Failure.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/Failure.java
index c2cd7ff..c580b72 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/Failure.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/Failure.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/A_avoidable.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/A_avoidable.java
index f69be6c..75963f2 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/A_avoidable.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/A_avoidable.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm.FailureTypes;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/A_mitigation.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/A_mitigation.java
index 918fab6..f9ca79e 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/A_mitigation.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/A_mitigation.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm.FailureTypes;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/C_avoidable.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/C_avoidable.java
index 131e6e7..fd4a810 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/C_avoidable.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/C_avoidable.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm.FailureTypes;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/C_mitigation.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/C_mitigation.java
index 9123d93..afd6ae7 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/C_mitigation.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/C_mitigation.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm.FailureTypes;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/D_avoidable.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/D_avoidable.java
index 30c2189..90082f8 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/D_avoidable.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/D_avoidable.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm.FailureTypes;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/D_mitigation.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/D_mitigation.java
index 701481d..fa81b04 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/D_mitigation.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/D_mitigation.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm.FailureTypes;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/FailureType.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/FailureType.java
index b871071..52a6107 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/FailureType.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/FailureType.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm.FailureTypes;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/FailureTypesFactory.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/FailureTypesFactory.java
index 4d1bc59..3e93608 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/FailureTypesFactory.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/FailureTypesFactory.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm.FailureTypes;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/FailureTypesPackage.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/FailureTypesPackage.java
index 28327d4..e2f639b 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/FailureTypesPackage.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/FailureTypesPackage.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm.FailureTypes;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/I_avoidable.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/I_avoidable.java
index b94deb0..9f88e42 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/I_avoidable.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/I_avoidable.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm.FailureTypes;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/I_mitigation.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/I_mitigation.java
index 275cbb3..b7826d9 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/I_mitigation.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FailureTypes/I_mitigation.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm.FailureTypes;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FlaBehaviour.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FlaBehaviour.java
index b6aa4de..aa44512 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FlaBehaviour.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FlaBehaviour.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FlammFactory.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FlammFactory.java
index f285bbf..7769306 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FlammFactory.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FlammFactory.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FlammPackage.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FlammPackage.java
index 05014e0..18e0a18 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FlammPackage.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/FlammPackage.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/NamedElement.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/NamedElement.java
index b583af5..97c85e7 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/NamedElement.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/NamedElement.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/Port.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/Port.java
index 82e5b2d..12f3cd2 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/Port.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/Port.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/PortFailureTuple.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/PortFailureTuple.java
index 45d57fb..cc4c1ad 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/PortFailureTuple.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/PortFailureTuple.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/Rule.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/Rule.java
index 9e84fe0..332c4a8 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/Rule.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/Rule.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/SimpleComponent.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/SimpleComponent.java
index f2b4076..578b576 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/SimpleComponent.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/SimpleComponent.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/analysis/FlaLogger.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/analysis/FlaLogger.java
index 05a608b..2dee6dc 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/analysis/FlaLogger.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/analysis/FlaLogger.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm.analysis;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/analysis/FlaSystem.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/analysis/FlaSystem.java
index c2c5331..20b4242 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/analysis/FlaSystem.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/analysis/FlaSystem.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm.analysis;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/analysis/SimpleFlaLogger.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/analysis/SimpleFlaLogger.java
index 78e0a4d..e601bd6 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/analysis/SimpleFlaLogger.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/analysis/SimpleFlaLogger.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm.analysis;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/util/FlammAdapterFactory.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/util/FlammAdapterFactory.java
index c563c73..77dfae5 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/util/FlammAdapterFactory.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/util/FlammAdapterFactory.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm.util;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/util/FlammReader.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/util/FlammReader.java
index 02f19e5..afbd9b4 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/util/FlammReader.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/util/FlammReader.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm.util;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/util/FlammResourceFactoryImpl.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/util/FlammResourceFactoryImpl.java
index db2cf71..b2c26c2 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/util/FlammResourceFactoryImpl.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/util/FlammResourceFactoryImpl.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm.util;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/util/FlammResourceImpl.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/util/FlammResourceImpl.java
index a8aaa5f..0749b25 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/util/FlammResourceImpl.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/util/FlammResourceImpl.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm.util;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/util/FlammSwitch.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/util/FlammSwitch.java
index 7bff934..937e974 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/util/FlammSwitch.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/util/FlammSwitch.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm.util;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/util/FlammXMLProcessor.java b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/util/FlammXMLProcessor.java
index 9e00877..5f266ed 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/util/FlammXMLProcessor.java
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/src/org/polarsys/chess/fla/flamm/util/FlammXMLProcessor.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.flamm.util;

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/about.html b/plugins/fla/org.polarsys.chess.fla.flaxml/about.html
index 2091030..164f781 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/about.html
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/about.html
@@ -1,28 +1,36 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/build.properties b/plugins/fla/org.polarsys.chess.fla.flaxml/build.properties
index f69ac01..7e81b13 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/build.properties
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/build.properties
@@ -8,7 +8,7 @@
 #  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

+#  http://www.eclipse.org/legal/epl-v20.html

 ###############################################################################

 #

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/plugin.properties b/plugins/fla/org.polarsys.chess.fla.flaxml/plugin.properties
index 509f68c..0dbfee3 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/plugin.properties
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/plugin.properties
@@ -8,7 +8,7 @@
 #  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

+#  http://www.eclipse.org/legal/epl-v20.html

 ###############################################################################

 #

 

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/Component.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/Component.java
index 4e7b26b..542d8b0 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/Component.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/Component.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/Components.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/Components.java
index 5eed197..24ab45a 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/Components.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/Components.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/CompositeComponent.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/CompositeComponent.java
index 2324f8a..06f11d5 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/CompositeComponent.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/CompositeComponent.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/Connection.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/Connection.java
index 036fd9f..424494b 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/Connection.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/Connection.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/Connections.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/Connections.java
index d7b6a19..12eaad7 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/Connections.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/Connections.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/DocumentRoot.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/DocumentRoot.java
index 5173fa3..03e94d7 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/DocumentRoot.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/DocumentRoot.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/Failure.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/Failure.java
index f0ce017..566523a 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/Failure.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/Failure.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/FailureType.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/FailureType.java
index 39dc4da..3744abc 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/FailureType.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/FailureType.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/FlaxmlFactory.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/FlaxmlFactory.java
index 65d2380..f1cf03d 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/FlaxmlFactory.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/FlaxmlFactory.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/FlaxmlPackage.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/FlaxmlPackage.java
index 8ecb357..49ba6bc 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/FlaxmlPackage.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/FlaxmlPackage.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/FptcRules.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/FptcRules.java
index 98b5f19..d0759f2 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/FptcRules.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/FptcRules.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/InputPort.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/InputPort.java
index 030b0e8..c6c0473 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/InputPort.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/InputPort.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/InputPorts.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/InputPorts.java
index 2dd53ee..3eeb618 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/InputPorts.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/InputPorts.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/NamedElement.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/NamedElement.java
index 961074d..f4aa22e 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/NamedElement.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/NamedElement.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/OutputPort.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/OutputPort.java
index 987bb19..6308547 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/OutputPort.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/OutputPort.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/OutputPorts.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/OutputPorts.java
index f179510..44c9c56 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/OutputPorts.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/OutputPorts.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/RuleString.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/RuleString.java
index 4154ada..1cc6919 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/RuleString.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/RuleString.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/SimpleComponent.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/SimpleComponent.java
index a26d893..e558cda 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/SimpleComponent.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/SimpleComponent.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/System.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/System.java
index 76f11bc..15aefa2 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/System.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/System.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/ComponentImpl.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/ComponentImpl.java
index 1715315..f975250 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/ComponentImpl.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/ComponentImpl.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/ComponentsImpl.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/ComponentsImpl.java
index 5aab553..333bd4d 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/ComponentsImpl.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/ComponentsImpl.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/CompositeComponentImpl.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/CompositeComponentImpl.java
index e75ada9..4f8b4d0 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/CompositeComponentImpl.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/CompositeComponentImpl.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/ConnectionImpl.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/ConnectionImpl.java
index 5236f89..22a522a 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/ConnectionImpl.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/ConnectionImpl.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/ConnectionsImpl.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/ConnectionsImpl.java
index dbbe5e3..0aa27dd 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/ConnectionsImpl.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/ConnectionsImpl.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/DocumentRootImpl.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/DocumentRootImpl.java
index ab19bc0..10944bb 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/DocumentRootImpl.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/DocumentRootImpl.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/FailureImpl.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/FailureImpl.java
index 9a6a659..e7e05da 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/FailureImpl.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/FailureImpl.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/FlaxmlFactoryImpl.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/FlaxmlFactoryImpl.java
index 524dd96..6b3457d 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/FlaxmlFactoryImpl.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/FlaxmlFactoryImpl.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/FlaxmlPackageImpl.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/FlaxmlPackageImpl.java
index 023d3f3..1c5e50b 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/FlaxmlPackageImpl.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/FlaxmlPackageImpl.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/FptcRulesImpl.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/FptcRulesImpl.java
index be6319d..875e5ae 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/FptcRulesImpl.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/FptcRulesImpl.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/InputPortImpl.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/InputPortImpl.java
index d74141c..d316729 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/InputPortImpl.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/InputPortImpl.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/InputPortsImpl.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/InputPortsImpl.java
index 99dd432..e7f1143 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/InputPortsImpl.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/InputPortsImpl.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/NamedElementImpl.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/NamedElementImpl.java
index 418e935..ba4e2a6 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/NamedElementImpl.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/NamedElementImpl.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/OutputPortImpl.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/OutputPortImpl.java
index 5a2fbb8..c3e650d 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/OutputPortImpl.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/OutputPortImpl.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/OutputPortsImpl.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/OutputPortsImpl.java
index a385b8c..45b99b3 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/OutputPortsImpl.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/OutputPortsImpl.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/RuleStringImpl.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/RuleStringImpl.java
index e0fcd24..808209f 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/RuleStringImpl.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/RuleStringImpl.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/SimpleComponentImpl.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/SimpleComponentImpl.java
index a9edb1f..36e0d1f 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/SimpleComponentImpl.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/SimpleComponentImpl.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/SystemImpl.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/SystemImpl.java
index a55c4f8..2337eed 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/SystemImpl.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/impl/SystemImpl.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/util/FlaxmlAdapterFactory.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/util/FlaxmlAdapterFactory.java
index 748e7a9..b5e16d2 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/util/FlaxmlAdapterFactory.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/util/FlaxmlAdapterFactory.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/util/FlaxmlResourceFactoryImpl.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/util/FlaxmlResourceFactoryImpl.java
index 22526dc..bcfb170 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/util/FlaxmlResourceFactoryImpl.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/util/FlaxmlResourceFactoryImpl.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/util/FlaxmlResourceImpl.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/util/FlaxmlResourceImpl.java
index 7bb8a40..d9dd688 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/util/FlaxmlResourceImpl.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/util/FlaxmlResourceImpl.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/util/FlaxmlSwitch.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/util/FlaxmlSwitch.java
index 0433e8c..5a394c3 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/util/FlaxmlSwitch.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/util/FlaxmlSwitch.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/util/FlaxmlValidator.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/util/FlaxmlValidator.java
index e74fdbb..7003dd7 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/util/FlaxmlValidator.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/util/FlaxmlValidator.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/util/FlaxmlXMLProcessor.java b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/util/FlaxmlXMLProcessor.java
index 2874b25..befea44 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/util/FlaxmlXMLProcessor.java
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/src/org/polarsys/chess/fla/flaxml/util/FlaxmlXMLProcessor.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  */

diff --git a/plugins/fla/org.polarsys.chess.fla.transformations/about.html b/plugins/fla/org.polarsys.chess.fla.transformations/about.html
index 2091030..164f781 100644
--- a/plugins/fla/org.polarsys.chess.fla.transformations/about.html
+++ b/plugins/fla/org.polarsys.chess.fla.transformations/about.html
@@ -1,28 +1,36 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/fla/org.polarsys.chess.fla/about.html b/plugins/fla/org.polarsys.chess.fla/about.html
index 2091030..164f781 100644
--- a/plugins/fla/org.polarsys.chess.fla/about.html
+++ b/plugins/fla/org.polarsys.chess.fla/about.html
@@ -1,28 +1,36 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/Activator.java b/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/Activator.java
index 9517efe..0d99a62 100644
--- a/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/Activator.java
+++ b/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/Activator.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 

 package org.polarsys.chess.fla;

diff --git a/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/common/FlaAnalysisException.java b/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/common/FlaAnalysisException.java
index 7dd131d..8fd8ded 100644
--- a/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/common/FlaAnalysisException.java
+++ b/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/common/FlaAnalysisException.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.common;

 

diff --git a/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/common/FlaLogger.java b/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/common/FlaLogger.java
index 0aa8650..b7d5a35 100644
--- a/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/common/FlaLogger.java
+++ b/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/common/FlaLogger.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.common;

 

diff --git a/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/common/TransformationException.java b/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/common/TransformationException.java
index 0aa58eb..639fe91 100644
--- a/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/common/TransformationException.java
+++ b/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/common/TransformationException.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.common;

 

diff --git a/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/impl/FlaAnalysisRunner.java b/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/impl/FlaAnalysisRunner.java
index 2d980b2..18e405a 100644
--- a/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/impl/FlaAnalysisRunner.java
+++ b/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/impl/FlaAnalysisRunner.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.impl;

 

diff --git a/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/impl/FlaAnalysisRunnerXml.java b/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/impl/FlaAnalysisRunnerXml.java
index 5d5afd0..fcb5670 100644
--- a/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/impl/FlaAnalysisRunnerXml.java
+++ b/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/impl/FlaAnalysisRunnerXml.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.impl;

 

diff --git a/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/launch/Activator.java b/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/launch/Activator.java
index ec0f5cd..33fd139 100644
--- a/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/launch/Activator.java
+++ b/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/launch/Activator.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.launch;

 

diff --git a/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/launch/FlaAnalysisCommand.java b/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/launch/FlaAnalysisCommand.java
index 12483ea..c6a637a 100644
--- a/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/launch/FlaAnalysisCommand.java
+++ b/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/launch/FlaAnalysisCommand.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.launch;

 

diff --git a/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/launch/FlaAnalysisCommandXml.java b/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/launch/FlaAnalysisCommandXml.java
index 9efe9eb..b7b9aff 100644
--- a/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/launch/FlaAnalysisCommandXml.java
+++ b/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/launch/FlaAnalysisCommandXml.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.launch;

 

diff --git a/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/preferences/ConcertoFlaPreferencePage.java b/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/preferences/ConcertoFlaPreferencePage.java
index 56e3155..6fd1ded 100644
--- a/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/preferences/ConcertoFlaPreferencePage.java
+++ b/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/preferences/ConcertoFlaPreferencePage.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.preferences;

 

diff --git a/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/preferences/FlaParameters.java b/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/preferences/FlaParameters.java
index ce09fd2..f906953 100644
--- a/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/preferences/FlaParameters.java
+++ b/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/preferences/FlaParameters.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.preferences;

 

diff --git a/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/preferences/PreferenceInitializer.java b/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/preferences/PreferenceInitializer.java
index b33a83c..0abe3dc 100644
--- a/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/preferences/PreferenceInitializer.java
+++ b/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/preferences/PreferenceInitializer.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 package org.polarsys.chess.fla.preferences;

 

diff --git a/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/transformations/QVToTransformation.java b/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/transformations/QVToTransformation.java
index a8dd1da..f4d2f62 100644
--- a/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/transformations/QVToTransformation.java
+++ b/plugins/fla/org.polarsys.chess.fla/src/org/polarsys/chess/fla/transformations/QVToTransformation.java
@@ -8,7 +8,7 @@
  *  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

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

  *******************************************************************************/

 /**

  * Logic from: QVTOML/Examples/InvokeInJava

diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/about.html b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/labeling/FlaDslDescriptionLabelProvider.xtend b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/labeling/FlaDslDescriptionLabelProvider.xtend
index cfbcac5..615a572 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/labeling/FlaDslDescriptionLabelProvider.xtend
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/labeling/FlaDslDescriptionLabelProvider.xtend
@@ -1,24 +1,39 @@
-/*
- * generated by Xtext 2.12.0
- */
-package org.polarsys.chess.xtext.ui.labeling
-
-import org.eclipse.xtext.ui.label.DefaultDescriptionLabelProvider
-
-/**
- * Provides labels for IEObjectDescriptions and IResourceDescriptions.
- * 
- * See https://www.eclipse.org/Xtext/documentation/304_ide_concepts.html#label-provider
- */
-class FlaDslDescriptionLabelProvider extends DefaultDescriptionLabelProvider {
-
-	// Labels and icons can be computed like this:
-	
-//	override text(IEObjectDescription ele) {
-//		ele.name.toString
-//	}
-//	 
-//	override image(IEObjectDescription ele) {
-//		ele.EClass.name + '.gif'
-//	}
-}
+/*

+ * generated by Xtext

+ */

+ /*------------------------------------------------------------------------------

+ -

+ - Copyright (c) 2013, 2015 Intecs SpA 

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

+ - are made available under the terms of the Eclipse Public License v2.0

+ - which accompanies this distribution, and is available at

+ - http://www.eclipse.org/legal/epl-v20.html

+ -

+ - Contributors:

+ - 

+ - Stefano Puri stefano.puri@intecs.it

+ -  

+ - Initial API and implementation and/or initial documentation

+ ------------------------------------------------------------------------------*/

+ 

+package org.polarsys.chess.xtext.ui.labeling

+

+//import org.eclipse.xtext.resource.IEObjectDescription

+

+/**

+ * Provides labels for IEObjectDescriptions and IResourceDescriptions.

+ * 

+ * See https://www.eclipse.org/Xtext/documentation/304_ide_concepts.html#label-provider

+ */

+class FlaDslDescriptionLabelProvider extends org.eclipse.xtext.ui.label.DefaultDescriptionLabelProvider {

+

+	// Labels and icons can be computed like this:

+	

+//	override text(IEObjectDescription ele) {

+//		ele.name.toString

+//	}

+//	 

+//	override image(IEObjectDescription ele) {

+//		ele.EClass.name + '.gif'

+//	}	 

+}

diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/labeling/FlaDslLabelProvider.xtend b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/labeling/FlaDslLabelProvider.xtend
index cd9421a..dc38e65 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/labeling/FlaDslLabelProvider.xtend
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/labeling/FlaDslLabelProvider.xtend
@@ -1,31 +1,44 @@
-/*
- * generated by Xtext 2.12.0
- */
-package org.polarsys.chess.xtext.ui.labeling
-
-import com.google.inject.Inject
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider
-import org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider
-
-/**
- * Provides labels for EObjects.
- * 
- * See https://www.eclipse.org/Xtext/documentation/304_ide_concepts.html#label-provider
- */
-class FlaDslLabelProvider extends DefaultEObjectLabelProvider {
-
-	@Inject
-	new(AdapterFactoryLabelProvider delegate) {
-		super(delegate);
-	}
-
-	// Labels and icons can be computed like this:
-	
-//	def text(Greeting ele) {
-//		'A greeting to ' + ele.name
-//	}
-//
-//	def image(Greeting ele) {
-//		'Greeting.gif'
-//	}
-}
+/*

+ * generated by Xtext

+ */

+ /*------------------------------------------------------------------------------

+ -

+ - Copyright (c) 2013, 2015 Intecs SpA 

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

+ - are made available under the terms of the Eclipse Public License v2.0

+ - which accompanies this distribution, and is available at

+ - http://www.eclipse.org/legal/epl-v20.html

+ -

+ - Contributors:

+ - 

+ - Stefano Puri stefano.puri@intecs.it

+ -  

+ - Initial API and implementation and/or initial documentation

+ ------------------------------------------------------------------------------*/

+ 

+package org.polarsys.chess.xtext.ui.labeling

+

+import com.google.inject.Inject

+

+/**

+ * Provides labels for EObjects.

+ * 

+ * See https://www.eclipse.org/Xtext/documentation/304_ide_concepts.html#label-provider

+ */

+class FlaDslLabelProvider extends org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider {

+

+	@Inject

+	new(org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider delegate) {

+		super(delegate);

+	}

+

+	// Labels and icons can be computed like this:

+	

+//	def text(Greeting ele) {

+//		'A greeting to ' + ele.name

+//	}

+//

+//	def image(Greeting ele) {

+//		'Greeting.gif'

+//	}

+}

diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/outline/FlaDslOutlineTreeProvider.xtend b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/outline/FlaDslOutlineTreeProvider.xtend
index 081bcfa..2638d31 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/outline/FlaDslOutlineTreeProvider.xtend
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/outline/FlaDslOutlineTreeProvider.xtend
@@ -1,15 +1,28 @@
-/*
- * generated by Xtext 2.12.0
- */
-package org.polarsys.chess.xtext.ui.outline
-
-import org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider
-
-/**
- * Customization of the default outline structure.
- *
- * See https://www.eclipse.org/Xtext/documentation/310_eclipse_support.html#outline
- */
-class FlaDslOutlineTreeProvider extends DefaultOutlineTreeProvider {
-
-}
+/*

+ * generated by Xtext

+ */

+ /*------------------------------------------------------------------------------

+ -

+ - Copyright (c) 2013, 2015 Intecs SpA 

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

+ - are made available under the terms of the Eclipse Public License v2.0

+ - which accompanies this distribution, and is available at

+ - http://www.eclipse.org/legal/epl-v20.html

+ -

+ - Contributors:

+ - 

+ - Stefano Puri stefano.puri@intecs.it

+ -  

+ - Initial API and implementation and/or initial documentation

+ ------------------------------------------------------------------------------*/

+ 

+package org.polarsys.chess.xtext.ui.outline

+

+/**

+ * Customization of the default outline structure.

+ *

+ * See https://www.eclipse.org/Xtext/documentation/304_ide_concepts.html#outline

+ */

+class FlaDslOutlineTreeProvider extends org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider {

+	

+}

diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/quickfix/FlaDslQuickfixProvider.xtend b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/quickfix/FlaDslQuickfixProvider.xtend
index db235c9..3c9b9c7 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/quickfix/FlaDslQuickfixProvider.xtend
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/quickfix/FlaDslQuickfixProvider.xtend
@@ -1,24 +1,41 @@
-/*
- * generated by Xtext 2.12.0
- */
-package org.polarsys.chess.xtext.ui.quickfix
-
-import org.eclipse.xtext.ui.editor.quickfix.DefaultQuickfixProvider
-
-/**
- * Custom quickfixes.
- *
- * See https://www.eclipse.org/Xtext/documentation/310_eclipse_support.html#quick-fixes
- */
-class FlaDslQuickfixProvider extends DefaultQuickfixProvider {
-
-//	@Fix(FlaDslValidator.INVALID_NAME)
-//	def capitalizeName(Issue issue, IssueResolutionAcceptor acceptor) {
-//		acceptor.accept(issue, 'Capitalize name', 'Capitalize the name.', 'upcase.png') [
-//			context |
-//			val xtextDocument = context.xtextDocument
-//			val firstLetter = xtextDocument.get(issue.offset, 1)
-//			xtextDocument.replace(issue.offset, 1, firstLetter.toUpperCase)
-//		]
-//	}
-}
+/*

+ * generated by Xtext

+ */

+ /*------------------------------------------------------------------------------

+ -

+ - Copyright (c) 2013, 2015 Intecs SpA 

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

+ - are made available under the terms of the Eclipse Public License v2.0

+ - which accompanies this distribution, and is available at

+ - http://www.eclipse.org/legal/epl-v20.html

+ -

+ - Contributors:

+ - 

+ - Stefano Puri stefano.puri@intecs.it

+ -  

+ - Initial API and implementation and/or initial documentation

+ ------------------------------------------------------------------------------*/

+ 

+package org.polarsys.chess.xtext.ui.quickfix

+

+//import org.eclipse.xtext.ui.editor.quickfix.Fix

+//import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor

+//import org.eclipse.xtext.validation.Issue

+

+/**

+ * Custom quickfixes.

+ *

+ * See https://www.eclipse.org/Xtext/documentation/304_ide_concepts.html#quick-fixes

+ */

+class FlaDslQuickfixProvider extends org.eclipse.xtext.ui.editor.quickfix.DefaultQuickfixProvider {

+

+//	@Fix(MyDslValidator::INVALID_NAME)

+//	def capitalizeName(Issue issue, IssueResolutionAcceptor acceptor) {

+//		acceptor.accept(issue, 'Capitalize name', 'Capitalize the name.', 'upcase.png') [

+//			context |

+//			val xtextDocument = context.xtextDocument

+//			val firstLetter = xtextDocument.get(issue.offset, 1)

+//			xtextDocument.replace(issue.offset, 1, firstLetter.toUpperCase)

+//		]

+//	}

+}

diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/about.html b/plugins/fla/org.polarsys.chess.xtext.fladsl/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/GenerateFlaDsl.mwe2 b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/GenerateFlaDsl.mwe2
index 9b95fe3..f4555b7 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/GenerateFlaDsl.mwe2
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/GenerateFlaDsl.mwe2
@@ -1,101 +1,201 @@
-module org.polarsys.chess.xtext.GenerateFlaDsl
-
-import org.eclipse.emf.mwe.utils.*
-import org.eclipse.xtext.xtext.generator.*
-import org.eclipse.xtext.xtext.generator.model.project.*
-
-var rootPath = ".."
-
-Workflow {
-		bean = StandaloneSetup {
-		  scanClassPath = true
-		  //load EMF ECORE	
-		uriMap = {
-            from = "platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore"
-            to = "platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore"
-        }
-		
-		uriMap = { from = "platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel"
-           		   to = "platform:/resource/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel"
-       	}
-        uriMap = {
-          from = "platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel"
-           to = "platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel"
-        }
-        registerGeneratedEPackage = "org.eclipse.emf.ecore.EcorePackage"
-        registerGeneratedEPackage = "org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage"
-        registerGenModelFile = "platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel"	
-		registerGenModelFile = "platform:/resource/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel"
-		
-		//load UML
-		
-		uriMap = {
-            from = "platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel"
-            to = "platform:/resource/org.eclipse.uml2.types/model/Types.genmodel"
-        }
-        uriMap = {
-            from = "platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel"
-            to = "platform:/resource/org.eclipse.uml2.uml/model/UML.genmodel"
-        }
-		
- 		uriMap = {
-            from = "platform:/plugin/org.eclipse.uml2.codegen.ecore/model/GenModel.genmodel"
-            to = "platform:/resource/org.eclipse.uml2.codegen.ecore/model/GenModel.genmodel" 
-        }
-        
-        uriMap = {
-            from = "platform:/plugin/org.eclipse.uml2.codegen.ecore/model/GenModel.ecore"
-            to = "platform:/resource/org.eclipse.uml2.codegen.ecore/model/GenModel.ecore"
-        }
-        uriMap = {
-            from = "platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore"
-            to = "platform:/resource/org.eclipse.uml2.uml/model/UML.ecore"
-        }
-        
-        uriMap = {
-            from = "platform:/plugin/org.eclipse.uml2.types/model/Types.ecore"
-            to = "platform:/resource/org.eclipse.uml2.types/model/Types.ecore"
-        }
-        registerGeneratedEPackage = "org.eclipse.uml2.types.TypesPackage"
-        registerGeneratedEPackage = "org.eclipse.uml2.uml.UMLPackage"
-        registerGeneratedEPackage = "org.eclipse.uml2.codegen.ecore.genmodel.GenModelPackage"
-        
-        registerGenModelFile = "platform:/resource/org.eclipse.uml2.types/model/Types.genmodel"
-	 	registerGenModelFile = "platform:/resource/org.eclipse.uml2.uml/model/UML.genmodel"
-        registerGenModelFile = "platform:/resource/org.eclipse.uml2.codegen.ecore/model/GenModel.genmodel"
-	}									
-							
-	component = XtextGenerator {
-		configuration = {
-			project = StandardProjectConfig {
-				baseName = "org.polarsys.chess.xtext.fladsl"
-				rootPath = rootPath
-				eclipsePlugin = {
-					enabled = true
-				}
-				createEclipseMetaData = true
-			}
-			code = {
-				encoding = "UTF-8"
-				lineDelimiter = "\n"
-				fileHeader = "/*\n * generated by Xtext \${version}\n */"
-			}
-		}
-		language = StandardLanguage {
-			name = "org.polarsys.chess.xtext.FlaDsl"
-			fileExtensions = "fladsl"
-
-			serializer = {
-				generateStub = true
-			}
-			
-			formatter = {
-				generateStub=true
-			}
-			
-			validator = {
-				// composedCheck = "org.eclipse.xtext.validation.NamesAreUniqueValidator"
-			}
-		}
-	}
-}
+/*------------------------------------------------------------------------------

+ -

+ - Copyright (c) 2013, 2015 Intecs SpA 

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

+ - are made available under the terms of the Eclipse Public License v2.0

+ - which accompanies this distribution, and is available at

+ - http://www.eclipse.org/legal/epl-v20.html

+ -

+ - Contributors:

+ - 

+ - Stefano Puri stefano.puri@intecs.it

+ -  

+ - Initial API and implementation and/or initial documentation

+ ------------------------------------------------------------------------------*/

+

+module org.polarsys.chess.xtext.GenerateFlaDsl

+

+import org.eclipse.emf.mwe.utils.*

+import org.eclipse.xtext.generator.*

+import org.eclipse.xtext.ui.generator.*

+

+var grammarURI = "classpath:/org/polarsys/chess/xtext/FlaDsl.xtext"

+var fileExtensions = "fladsl"

+var projectName = "org.polarsys.chess.xtext.fladsl"

+var runtimeProject = "../${projectName}"

+var generateXtendStub = true

+var encoding = "UTF-8"

+

+Workflow {

+    bean = StandaloneSetup {

+    	scanClassPath = true

+    	platformUri = "${runtimeProject}/.."

+    	

+    	//load EMF ECORE	

+		uriMap = {

+            from = "platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore"

+            to = "platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore"

+        }

+		

+		uriMap = { from = "platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel"

+           		   to = "platform:/resource/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel"

+       	}

+        uriMap = {

+          from = "platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel"

+           to = "platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel"

+        }

+        registerGeneratedEPackage = "org.eclipse.emf.ecore.EcorePackage"

+        registerGeneratedEPackage = "org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage"

+        registerGenModelFile = "platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel"	

+		registerGenModelFile = "platform:/resource/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel"

+		

+		//load UML

+		

+		uriMap = {

+            from = "platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel"

+            to = "platform:/resource/org.eclipse.uml2.types/model/Types.genmodel"

+        }

+        uriMap = {

+            from = "platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel"

+            to = "platform:/resource/org.eclipse.uml2.uml/model/UML.genmodel"

+        }

+		

+ 		uriMap = {

+            from = "platform:/plugin/org.eclipse.uml2.codegen.ecore/model/GenModel.genmodel"

+            to = "platform:/resource/org.eclipse.uml2.codegen.ecore/model/GenModel.genmodel" 

+        }

+        

+        uriMap = {

+            from = "platform:/plugin/org.eclipse.uml2.codegen.ecore/model/GenModel.ecore"

+            to = "platform:/resource/org.eclipse.uml2.codegen.ecore/model/GenModel.ecore"

+        }

+        uriMap = {

+            from = "platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore"

+            to = "platform:/resource/org.eclipse.uml2.uml/model/UML.ecore"

+        }

+        

+        uriMap = {

+            from = "platform:/plugin/org.eclipse.uml2.types/model/Types.ecore"

+            to = "platform:/resource/org.eclipse.uml2.types/model/Types.ecore"

+        }

+        registerGeneratedEPackage = "org.eclipse.uml2.types.TypesPackage"

+        registerGeneratedEPackage = "org.eclipse.uml2.uml.UMLPackage"

+        registerGeneratedEPackage = "org.eclipse.uml2.codegen.ecore.genmodel.GenModelPackage"

+        

+        registerGenModelFile = "platform:/resource/org.eclipse.uml2.types/model/Types.genmodel"

+	 	registerGenModelFile = "platform:/resource/org.eclipse.uml2.uml/model/UML.genmodel"

+        registerGenModelFile = "platform:/resource/org.eclipse.uml2.codegen.ecore/model/GenModel.genmodel"

+        

+	}

+    

+    component = DirectoryCleaner {

+    	directory = "${runtimeProject}/src-gen"

+    }

+    

+    component = DirectoryCleaner {

+    	directory = "${runtimeProject}/model/generated"

+    }

+    

+    component = DirectoryCleaner {

+    	directory = "${runtimeProject}.ui/src-gen"

+    }

+    

+    component = DirectoryCleaner {

+    	directory = "${runtimeProject}.tests/src-gen"

+    }

+    

+    component = Generator {

+    	pathRtProject = runtimeProject

+    	pathUiProject = "${runtimeProject}.ui"

+    	projectNameRt = projectName

+    	projectNameUi = "${projectName}.ui"

+    	encoding = encoding

+    	language = auto-inject {

+    		

+    		uri = grammarURI

+    

+    		// Java API to access grammar elements (required by several other fragments)

+    		fragment = grammarAccess.GrammarAccessFragment auto-inject {}

+    

+    		// generates Java API for the generated EPackages

+    		fragment = ecore.EMFGeneratorFragment auto-inject {}

+    

+    		// the old serialization component

+    		// fragment = parseTreeConstructor.ParseTreeConstructorFragment auto-inject {}    

+    

+    		// serializer 2.0

+    		fragment = serializer.SerializerFragment auto-inject {

+    			generateStub = false

+    		}

+    

+    		// a custom ResourceFactory for use with EMF

+    		fragment = resourceFactory.ResourceFactoryFragment auto-inject {}

+    

+    		// The antlr parser generator fragment.

+    		fragment = parser.antlr.XtextAntlrGeneratorFragment auto-inject {

+    		//  options = {

+    		//      backtrack = true

+    		//  }

+    		}

+    

+    		// Xtend-based API for validation

+    		fragment = validation.ValidatorFragment auto-inject {

+    		    composedCheck = "org.eclipse.xtext.validation.ImportUriValidator"

+    		//    composedCheck = "org.eclipse.xtext.validation.NamesAreUniqueValidator"

+    		}

+    

+    		// old scoping and exporting API

+    		// fragment = scoping.ImportURIScopingFragment auto-inject {}

+    		// fragment = exporting.SimpleNamesFragment auto-inject {}

+    

+    		// scoping and exporting API

+    		fragment = scoping.ImportNamespacesScopingFragment auto-inject {}

+    		fragment = exporting.QualifiedNamesFragment auto-inject {}

+    		fragment = builder.BuilderIntegrationFragment auto-inject {}

+    

+    		// generator API

+    		fragment = generator.GeneratorFragment auto-inject {}

+    

+    		// formatter API

+    		fragment = formatting.FormatterFragment auto-inject {}

+    

+    		// labeling API

+    		fragment = labeling.LabelProviderFragment auto-inject {}

+    

+    		// outline API

+    		fragment = outline.OutlineTreeProviderFragment auto-inject {}

+    		fragment = outline.QuickOutlineFragment auto-inject {}

+    

+    		// quickfix API

+    		fragment = quickfix.QuickfixProviderFragment auto-inject {}

+    

+    		// content assist API

+    		fragment = contentAssist.ContentAssistFragment auto-inject {}

+    

+    		// generates a more lightweight Antlr parser and lexer tailored for content assist

+    		fragment = parser.antlr.XtextAntlrUiGeneratorFragment auto-inject {}

+    

+    		// generates junit test support classes into Generator#pathTestProject

+    		fragment = junit.Junit4Fragment auto-inject {}

+    

+    		// rename refactoring

+    		fragment = refactoring.RefactorElementNameFragment auto-inject {}

+    

+    		// provides the necessary bindings for java types integration

+    		fragment = types.TypesGeneratorFragment auto-inject {}

+    

+    		// generates the required bindings only if the grammar inherits from Xbase

+    		fragment = xbase.XbaseGeneratorFragment auto-inject {}

+    		

+    		// generates the required bindings only if the grammar inherits from Xtype

+    		fragment = xbase.XtypeGeneratorFragment auto-inject {}

+    

+    		// provides a preference page for template proposals

+    		fragment = templates.CodetemplatesGeneratorFragment auto-inject {}

+    

+    		// provides a compare view

+    		fragment = compare.CompareFragment auto-inject {}

+    	}

+    }

+}

+

diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/formatting/FlaDslFormatter.xtend b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/formatting/FlaDslFormatter.xtend
new file mode 100644
index 0000000..2c6bb72
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/formatting/FlaDslFormatter.xtend
@@ -0,0 +1,45 @@
+/*

+ * generated by Xtext

+ */

+ /*------------------------------------------------------------------------------

+ -

+ - Copyright (c) 2013, 2015 Intecs SpA 

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

+ - are made available under the terms of the Eclipse Public License v2.0

+ - which accompanies this distribution, and is available at

+ - http://www.eclipse.org/legal/epl-v20.html

+ -

+ - Contributors:

+ - 

+ - Stefano Puri stefano.puri@intecs.it

+ -  

+ - Initial API and implementation and/or initial documentation

+ ------------------------------------------------------------------------------*/

+ 

+package org.polarsys.chess.xtext.formatting

+

+import org.eclipse.xtext.formatting.impl.AbstractDeclarativeFormatter

+import org.eclipse.xtext.formatting.impl.FormattingConfig

+// import com.google.inject.Inject;

+// import org.polarsys.chess.xtext.services.FlaDslGrammarAccess

+

+/**

+ * This class contains custom formatting declarations.

+ * 

+ * See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#formatting

+ * on how and when to use it.

+ * 

+ * Also see {@link org.eclipse.xtext.xtext.XtextFormattingTokenSerializer} as an example

+ */

+class FlaDslFormatter extends AbstractDeclarativeFormatter {

+

+//	@Inject extension FlaDslGrammarAccess

+	

+	override protected void configureFormatting(FormattingConfig c) {

+// It's usually a good idea to activate the following three statements.

+// They will add and preserve newlines around comments

+//		c.setLinewrap(0, 1, 2).before(SL_COMMENTRule)

+//		c.setLinewrap(0, 1, 2).before(ML_COMMENTRule)

+//		c.setLinewrap(0, 1, 1).after(ML_COMMENTRule)

+	}

+}

diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/generator/FlaDslGenerator.xtend b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/generator/FlaDslGenerator.xtend
index 19c89e8..2c8463d 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/generator/FlaDslGenerator.xtend
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/generator/FlaDslGenerator.xtend
@@ -1,25 +1,39 @@
-/*
- * generated by Xtext 2.12.0
- */
-package org.polarsys.chess.xtext.generator
-
-import org.eclipse.emf.ecore.resource.Resource
-import org.eclipse.xtext.generator.AbstractGenerator
-import org.eclipse.xtext.generator.IFileSystemAccess2
-import org.eclipse.xtext.generator.IGeneratorContext
-
-/**
- * Generates code from your model files on save.
- * 
- * See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#code-generation
- */
-class FlaDslGenerator extends AbstractGenerator {
-
-	override void doGenerate(Resource resource, IFileSystemAccess2 fsa, IGeneratorContext context) {
-//		fsa.generateFile('greetings.txt', 'People to greet: ' + 
-//			resource.allContents
-//				.filter(Greeting)
-//				.map[name]
-//				.join(', '))
-	}
-}
+/*

+ * generated by Xtext

+ */

+ /*------------------------------------------------------------------------------

+ -

+ - Copyright (c) 2013, 2015 Intecs SpA 

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

+ - are made available under the terms of the Eclipse Public License v2.0

+ - which accompanies this distribution, and is available at

+ - http://www.eclipse.org/legal/epl-v20.html

+ -

+ - Contributors:

+ - 

+ - Stefano Puri stefano.puri@intecs.it

+ -  

+ - Initial API and implementation and/or initial documentation

+ ------------------------------------------------------------------------------*/

+ 

+package org.polarsys.chess.xtext.generator

+

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

+import org.eclipse.xtext.generator.IGenerator

+import org.eclipse.xtext.generator.IFileSystemAccess

+

+/**

+ * Generates code from your model files on save.

+ * 

+ * See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#code-generation

+ */

+class FlaDslGenerator implements IGenerator {

+	

+	override void doGenerate(Resource resource, IFileSystemAccess fsa) {

+//		fsa.generateFile('greetings.txt', 'People to greet: ' + 

+//			resource.allContents

+//				.filter(typeof(Greeting))

+//				.map[name]

+//				.join(', '))

+	}

+}

diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/scoping/FlaDslScopeProvider.xtend b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/scoping/FlaDslScopeProvider.xtend
index 51e374f..bc0507b 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/scoping/FlaDslScopeProvider.xtend
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/scoping/FlaDslScopeProvider.xtend
@@ -1,15 +1,80 @@
-/*
- * generated by Xtext 2.12.0
- */
-package org.polarsys.chess.xtext.scoping
-
-
-/**
- * This class contains custom scoping description.
- * 
- * See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#scoping
- * on how and when to use it.
- */
-class FlaDslScopeProvider extends AbstractFlaDslScopeProvider {
-
-}
+/*

+ * generated by Xtext

+ */

+ /*------------------------------------------------------------------------------

+ -

+ - Copyright (c) 2013, 2015 Intecs SpA 

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

+ - are made available under the terms of the Eclipse Public License v2.0

+ - which accompanies this distribution, and is available at

+ - http://www.eclipse.org/legal/epl-v20.html

+ -

+ - Contributors:

+ - 

+ - Stefano Puri stefano.puri@intecs.it

+ -  

+ - Initial API and implementation and/or initial documentation

+ ------------------------------------------------------------------------------*/

+ 

+package org.polarsys.chess.xtext.scoping

+

+import org.eclipse.emf.ecore.EReference

+import org.eclipse.xtext.scoping.IScope

+import org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider

+import org.polarsys.chess.xtext.global.utils.XtextUtils

+import org.eclipse.uml2.uml.Port

+import org.eclipse.xtext.scoping.Scopes

+import org.eclipse.emf.ecore.EObject

+import org.eclipse.emf.common.util.EList

+import org.polarsys.chess.chessmlprofile.Dependability.FailurePropagation.FLABehavior;

+import org.polarsys.chess.chessmlprofile.Dependability.FailurePropagation.FPTC;

+import org.eclipse.uml2.uml.EncapsulatedClassifier

+

+/**

+ * This class contains custom scoping description.

+ * 

+ * See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#scoping

+ * on how and when to use it.

+ *

+ */

+class FlaDslScopeProvider extends AbstractDeclarativeScopeProvider {

+

+	EncapsulatedClassifier contextComponent ;

+	

+	new(){

+		val contextElement = XtextUtils.getContextElement;

+  		if(contextElement instanceof FPTC){

+			contextComponent = (contextElement as FPTC).getBase_Component();

+		}else if(contextElement instanceof FLABehavior){

+			if ((contextElement as FLABehavior).getBase_Class() != null) {

+				contextComponent = (contextElement as FLABehavior).getBase_Class() as EncapsulatedClassifier;

+			}

+			else if ((contextElement as FLABehavior).getBase_InstanceSpecification != null) {

+				contextComponent = (contextElement as FLABehavior).getBase_InstanceSpecification.classifiers.get(0) as EncapsulatedClassifier;

+			}

+		} 

+	} 

+

+/* 

+	def IScope scope_InputExpression_ref(InputExpression inExpr, EReference ref){

+		

+		val ports = contextComponent.ownedPorts

+		

+		//ports.forEach[println((it as Port).qualifiedName)]

+		

+//		val scope = delegateGetScope(inExpr, ref)

+//		

+//		val filter = [IEObjectDescription descr | ports.contains(descr.EObjectOrProxy as Port)]

+//		

+//		new FilteringScope(scope, filter);

+		

+		return Scopes.scopeFor(ports)

+	}*/

+	

+	override IScope getScope(EObject context, EReference reference){

+	   val EList<Port> ports = this.contextComponent.getOwnedPorts();

+	    return Scopes.scopeFor(ports);

+  	}

+  	

+  

+}

diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/validation/FlaDslValidator.xtend b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/validation/FlaDslValidator.xtend
index 962bc47..5f473f0 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/validation/FlaDslValidator.xtend
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/validation/FlaDslValidator.xtend
@@ -1,25 +1,40 @@
-/*
- * generated by Xtext 2.12.0
- */
-package org.polarsys.chess.xtext.validation
-
-
-/**
- * This class contains custom validation rules. 
- *
- * See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#validation
- */
-class FlaDslValidator extends AbstractFlaDslValidator {
-	
-//	public static val INVALID_NAME = 'invalidName'
-//
-//	@Check
-//	def checkGreetingStartsWithCapital(Greeting greeting) {
-//		if (!Character.isUpperCase(greeting.name.charAt(0))) {
-//			warning('Name should start with a capital', 
-//					FlaDslPackage.Literals.GREETING__NAME,
-//					INVALID_NAME)
-//		}
-//	}
-	
-}
+/*

+ * generated by Xtext

+ */

+ /*------------------------------------------------------------------------------

+ -

+ - Copyright (c) 2013, 2015 Intecs SpA 

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

+ - are made available under the terms of the Eclipse Public License v2.0

+ - which accompanies this distribution, and is available at

+ - http://www.eclipse.org/legal/epl-v20.html

+ -

+ - Contributors:

+ - 

+ - Stefano Puri stefano.puri@intecs.it

+ -  

+ - Initial API and implementation and/or initial documentation

+ ------------------------------------------------------------------------------*/

+ 

+package org.polarsys.chess.xtext.validation

+

+//import org.eclipse.xtext.validation.Check

+

+/**

+ * This class contains custom validation rules. 

+ *

+ * See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#validation

+ */

+class FlaDslValidator  {

+

+//  public static val INVALID_NAME = 'invalidName'

+//

+//	@Check

+//	def checkGreetingStartsWithCapital(Greeting greeting) {

+//		if (!Character.isUpperCase(greeting.name.charAt(0))) {

+//			warning('Name should start with a capital', 

+//					MyDslPackage.Literals.GREETING__NAME,

+//					INVALID_NAME)

+//		}

+//	}

+}

diff --git a/plugins/mobius/org.polarsys.chess.mobius.model.edit/about.html b/plugins/mobius/org.polarsys.chess.mobius.model.edit/about.html
new file mode 100644
index 0000000..58211cf
--- /dev/null
+++ b/plugins/mobius/org.polarsys.chess.mobius.model.edit/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>May 28, 2019</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/mobius/org.polarsys.chess.mobius.model.editor/about.html b/plugins/mobius/org.polarsys.chess.mobius.model.editor/about.html
new file mode 100644
index 0000000..58211cf
--- /dev/null
+++ b/plugins/mobius/org.polarsys.chess.mobius.model.editor/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>May 28, 2019</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/mobius/org.polarsys.chess.mobius.model/about.html b/plugins/mobius/org.polarsys.chess.mobius.model/about.html
new file mode 100644
index 0000000..58211cf
--- /dev/null
+++ b/plugins/mobius/org.polarsys.chess.mobius.model/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>May 28, 2019</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/mobius/org.polarsys.chess.mobius.preferences/about.html b/plugins/mobius/org.polarsys.chess.mobius.preferences/about.html
index 58211cf..164f781 100644
--- a/plugins/mobius/org.polarsys.chess.mobius.preferences/about.html
+++ b/plugins/mobius/org.polarsys.chess.mobius.preferences/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 28, 2019</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/plugins/mobius/org.polarsys.chess.mobius/about.html b/plugins/mobius/org.polarsys.chess.mobius/about.html
index 58211cf..164f781 100644
--- a/plugins/mobius/org.polarsys.chess.mobius/about.html
+++ b/plugins/mobius/org.polarsys.chess.mobius/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 28, 2019</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/plugins/mobius/org.polarsys.chess.mobius/src/org/polarsys/chess/mobius/handlers/CHESS2SANRunner.java b/plugins/mobius/org.polarsys.chess.mobius/src/org/polarsys/chess/mobius/handlers/CHESS2SANRunner.java
index 76af5b4..fcd744f 100644
--- a/plugins/mobius/org.polarsys.chess.mobius/src/org/polarsys/chess/mobius/handlers/CHESS2SANRunner.java
+++ b/plugins/mobius/org.polarsys.chess.mobius/src/org/polarsys/chess/mobius/handlers/CHESS2SANRunner.java
@@ -1,15 +1,16 @@
-/*******************************************************************************

- *                  CHESS Mobius plugin

- *

- *               Copyright (C) 2019

- *            			Intecs

- *

- *

- *  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 (c) 2019 Intecs Solutions SpA

+*

+* This program and the accompanying materials are made

+* available under the terms of the Eclipse Public License 2.0

+* which is available at https://www.eclipse.org/legal/epl-2.0/

+*

+* SPDX-License-Identifier: EPL-2.0

+*

+* Contributors: 

+*   Intecs Solutions - Initial API and implementation

+*   

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

 package org.polarsys.chess.mobius.handlers;

 

 import static org.polarsys.chess.core.util.CHESSProjectSupport.printlnToCHESSConsole;

diff --git a/plugins/mobius/org.polarsys.chess.mobius/src/org/polarsys/chess/mobius/templates/projectFileTemplate_sanmodel.mtl b/plugins/mobius/org.polarsys.chess.mobius/src/org/polarsys/chess/mobius/templates/projectFileTemplate_sanmodel.mtl
index 2ad40a4..001cde7 100644
--- a/plugins/mobius/org.polarsys.chess.mobius/src/org/polarsys/chess/mobius/templates/projectFileTemplate_sanmodel.mtl
+++ b/plugins/mobius/org.polarsys.chess.mobius/src/org/polarsys/chess/mobius/templates/projectFileTemplate_sanmodel.mtl
@@ -29,9 +29,6 @@
 	<atomic key="[node.oclAsType(AtomicNode).model.replaceAll('\\.', '_')/]">
       <value name="[node.oclAsType(AtomicNode).model.replaceAll('\\.', '_')/]" type="SAN Model"/>
    	</atomic>
-	<atomic key="[node.oclAsType(AtomicNode).name.replaceAll('\\.', '_')/]">
-      <value name="[node.oclAsType(AtomicNode).name.replaceAll('\\.', '_')/]" type="SAN Model"/>
-   	</atomic>
 	[else]
 	[if (node.oclIsKindOf(ComposedNode) and node.eContainer().oclIsKindOf(SANModel))]
 	<composed key="[node.name.replaceAll('\\.', '_')/]">
diff --git a/plugins/mobius/org.polarsys.chess.mobius/src/org/polarsys/chess/mobius/transformations/QVToTransformation.java b/plugins/mobius/org.polarsys.chess.mobius/src/org/polarsys/chess/mobius/transformations/QVToTransformation.java
index f31d364..d0e2c07 100644
--- a/plugins/mobius/org.polarsys.chess.mobius/src/org/polarsys/chess/mobius/transformations/QVToTransformation.java
+++ b/plugins/mobius/org.polarsys.chess.mobius/src/org/polarsys/chess/mobius/transformations/QVToTransformation.java
@@ -1,15 +1,16 @@
-/*******************************************************************************

- *                  CHESS Mobius plugin

- *

- *               Copyright (C) 2019

- *            			Intecs

- *

- *

- *  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 (c) 2019 Intecs Solutions SpA

+*

+* This program and the accompanying materials are made

+* available under the terms of the Eclipse Public License 2.0

+* which is available at https://www.eclipse.org/legal/epl-2.0/

+*

+* SPDX-License-Identifier: EPL-2.0

+*

+* Contributors: 

+*   Intecs Solutions - Initial API and implementation

+*   

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

 

 package org.polarsys.chess.mobius.transformations;

 

diff --git a/plugins/mobius/org.polarsys.chess.mobius/src/org/polarsys/chess/mobius/utils/QVTBlackBox.java b/plugins/mobius/org.polarsys.chess.mobius/src/org/polarsys/chess/mobius/utils/QVTBlackBox.java
index 30c860c..34ab96c 100644
--- a/plugins/mobius/org.polarsys.chess.mobius/src/org/polarsys/chess/mobius/utils/QVTBlackBox.java
+++ b/plugins/mobius/org.polarsys.chess.mobius/src/org/polarsys/chess/mobius/utils/QVTBlackBox.java
@@ -1,3 +1,18 @@
+

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

+* Copyright (c) 2019 Intecs Solutions SpA

+*

+* This program and the accompanying materials are made

+* available under the terms of the Eclipse Public License 2.0

+* which is available at https://www.eclipse.org/legal/epl-2.0/

+*

+* SPDX-License-Identifier: EPL-2.0

+*

+* Contributors: 

+*   Intecs Solutions - Initial API and implementation

+*   

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

+

 package org.polarsys.chess.mobius.utils;

 

 import java.util.ArrayList;

diff --git a/plugins/mobius/org.polarsys.chess.mobius/tasks/RewardTemplate.xml b/plugins/mobius/org.polarsys.chess.mobius/tasks/RewardTemplate.xml
deleted file mode 100644
index edf9d0a..0000000
--- a/plugins/mobius/org.polarsys.chess.mobius/tasks/RewardTemplate.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="RewardTemplate" name="org.polarsys.chess.mobius">
-    <property name="ECLIPSE_HOME" value="../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515"/>
-    <property name="ECLIPSE_WORKSPACE" value="../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515/workspace_san3"/>
-
-    <!-- The classpath with only the dependencies used by the project -->
-    <path id="org.polarsys.chess.mobius.libraryclasspath">
-        <pathelement location="${ECLIPSE_WORKSPACE}/org.polarsys.chess.mobius/bin"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/resources.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/rt.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/jsse.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/jce.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/charsets.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/jfr.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/access-bridge-64.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/cldrdata.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/dnsns.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/jaccess.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/jfxrt.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/localedata.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/nashorn.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunec.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunjce_provider.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunmscapi.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunpkcs11.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/zipfs.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui_3.108.1.v20160929-1045.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt_3.105.3.v20170228-0512.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt.win32.win32.x86_64_3.105.3.v20170228-0512.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.jface_3.12.2.v20170113-2113.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.commands_3.8.1.v20161221-1651.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.workbench_3.108.3.v20170216-1539.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.resources_3.11.1.v20161107-2032.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.engine_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.common_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.model_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore_2.12.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.common_2.12.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.xmi_2.12.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.profiler_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl.ecore_3.6.0.v20160523-1914.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl_3.6.0.v20160523-1914.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/lpg.runtime.java_2.0.17.v201004271640.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl.common_1.4.0.v20160521-2033.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen.ecore_2.12.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.uml_5.2.3.v20170227-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.common_2.1.0.v20170227-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.types_2.0.0.v20170227-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.mapping.ecore2xml_2.9.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.polarsys.chess.service_0.11.0.201812071049.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.polarsys.chess.core_0.9.0.201812071049.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.editor_1.3.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.ui_1.3.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core_2.1.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.tools_2.0.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.log_1.2.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/javax.inject_1.0.0.v20091030.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi_3.11.3.v20170209-1843.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.fx.osgi_2.4.0.201605100504.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.registry_3.6.100.v20160223-2218.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.preferences_3.6.1.v20160815-1406.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.contenttype_3.5.100.v20160418-1621.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/com.google.guava_15.0.0.v201403281430.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.databinding.observable_1.6.0.v20160511-1747.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sashwindows.di_1.2.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.transaction_1.9.0.201606071900.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.edit_2.12.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.change_2.11.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.validation_1.8.0.201606071713.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.expressions_3.5.100.v20160418-1621.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.ide_3.12.3.v20170119-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sasheditor.di_2.0.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sasheditor_2.0.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.widgets_2.0.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.databinding_1.6.0.v20160412-0910.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.views.properties.tabbed_3.7.0.v20160310-0903.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.forms_3.7.1.v20161220-1635.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.views_3.8.102.v20170111-0801.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.services.labelprovider_1.2.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.jface.text_3.11.2.v20170220-1911.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.text_3.6.0.v20160503-1849.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.3.201810170111.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.parser_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.common_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.emf.util_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.cst.parser_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.ecore.imperativeocl_3.4.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.project_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.runtime_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.diagram.ui_1.8.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gef_3.11.0.201606061308.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.draw2d_3.10.100.201606061308.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.workspace_1.5.1.201606071900.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.clipboard.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.ui_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.action_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.services.action_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.services_1.9.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui_1.8.1.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.console_3.6.201.v20161107-0337.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.workbench.texteditor_3.10.1.v20160818-1626.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.team.core_3.8.0.v20160418-1534.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.type.core_1.9.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.commands.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.gef.ui_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.draw2d.ui_1.9.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.notation_1.8.0.201606071631.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.diagram.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.debug.core_3.10.100.v20160419-1720.jar"/>
-    </path>
-
-    <path id="org.polarsys.chess.mobius.classpath">
-        <path refid="org.polarsys.chess.mobius.libraryclasspath"/>
-    </path>
-
-    <!-- The classpath with only the jars available in the plugin folder of Eclipse -->
-    <path id="org.polarsys.chess.mobius.libraryclasspath.alljars">
-        <pathelement location="../org.polarsys.chess.mobius/bin"/>
-        <fileset dir="${ECLIPSE_HOME}/plugins/" includes="*.jar"/>
-    </path>
-
-    <path id="org.polarsys.chess.mobius.classpath.alljars">
-        <path refid="org.polarsys.chess.mobius.libraryclasspath.alljars"/>
-    </path>
-
-    <!-- The default task with the jars used by this project -->
-    <target name="RewardTemplate">
-        <java classname="org.polarsys.chess.mobius.templates.RewardTemplate" classpathref="org.polarsys.chess.mobius.classpath">
-            <arg value="${model}"/>
-            <arg value="${target}"/>
-        </java>
-    </target>
-
-    <!--
-        In case of problem you can also try with all the jar available in your Eclipse
-        Keep in mind that having two versions of the same jar can create problems
-    -->
-    <target name="RewardTemplate.alljars">
-        <java classname="org.polarsys.chess.mobius.templates.RewardTemplate" classpathref="org.polarsys.chess.mobius.classpath">
-            <arg value="${model}"/>
-            <arg value="${target}"/>
-        </java>
-    </target>
-</project>
diff --git a/plugins/mobius/org.polarsys.chess.mobius/tasks/RewardTemplateTarget.xml b/plugins/mobius/org.polarsys.chess.mobius/tasks/RewardTemplateTarget.xml
deleted file mode 100644
index fb860c9..0000000
--- a/plugins/mobius/org.polarsys.chess.mobius/tasks/RewardTemplateTarget.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Place this file in the target project and call it with "External Tools > Run As > Ant Build" -->
-<!-- You have to change the MODEL and the TARGET values -->
-
-<project basedir="." default="RewardTemplateSample" name="org.polarsys.chess.mobiusSample">
-	<import file="../../org.polarsys.chess.mobius/tasks/RewardTemplate.xml"/>
-
-    <!-- Change the values of MODEL and TARGET to point to your model and output folder -->
-	<property name="MODEL" value="${basedir}/model/file.xmi"/>
-	<property name="TARGET" value="${basedir}/src-gen"/>
-
-	<target name="RewardTemplateSample" description="Generate files in 'TARGET'">
-		<antcall target="RewardTemplate" >
-			<param name="model" value="${MODEL}"/>
-			<param name="target" value="${TARGET}"/>
-		</antcall>
-	</target>
-</project>
diff --git a/plugins/mobius/org.polarsys.chess.mobius/tasks/atomicComponentRewardTemplate.xml b/plugins/mobius/org.polarsys.chess.mobius/tasks/atomicComponentRewardTemplate.xml
deleted file mode 100644
index 69441b2..0000000
--- a/plugins/mobius/org.polarsys.chess.mobius/tasks/atomicComponentRewardTemplate.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="atomicComponentRewardTemplate" name="org.polarsys.chess.mobius">
-    <property name="ECLIPSE_HOME" value="../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515"/>
-    <property name="ECLIPSE_WORKSPACE" value="../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515/runtime-New_configuration_2"/>
-
-    <!-- The classpath with only the dependencies used by the project -->
-    <path id="org.polarsys.chess.mobius.libraryclasspath">
-        <pathelement location="${ECLIPSE_WORKSPACE}/org.polarsys.chess.mobius/bin"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/resources.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/rt.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/jsse.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/jce.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/charsets.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/jfr.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/access-bridge-64.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/cldrdata.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/dnsns.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/jaccess.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/jfxrt.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/localedata.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/nashorn.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunec.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunjce_provider.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunmscapi.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunpkcs11.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/zipfs.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui_3.108.1.v20160929-1045.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt_3.105.3.v20170228-0512.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt.win32.win32.x86_64_3.105.3.v20170228-0512.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.jface_3.12.2.v20170113-2113.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.commands_3.8.1.v20161221-1651.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.workbench_3.108.3.v20170216-1539.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.resources_3.11.1.v20161107-2032.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.engine_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.common_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.model_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore_2.12.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.common_2.12.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.xmi_2.12.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.profiler_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl.ecore_3.6.0.v20160523-1914.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl_3.6.0.v20160523-1914.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/lpg.runtime.java_2.0.17.v201004271640.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl.common_1.4.0.v20160521-2033.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen.ecore_2.12.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.uml_5.2.3.v20170227-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.common_2.1.0.v20170227-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.types_2.0.0.v20170227-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.mapping.ecore2xml_2.9.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.polarsys.chess.service_0.11.0.201812071049.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.polarsys.chess.core_0.9.0.201812071049.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.editor_1.3.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.ui_1.3.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core_2.1.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.tools_2.0.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.log_1.2.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/javax.inject_1.0.0.v20091030.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi_3.11.3.v20170209-1843.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.fx.osgi_2.4.0.201605100504.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.registry_3.6.100.v20160223-2218.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.preferences_3.6.1.v20160815-1406.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.contenttype_3.5.100.v20160418-1621.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/com.google.guava_15.0.0.v201403281430.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.databinding.observable_1.6.0.v20160511-1747.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sashwindows.di_1.2.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.transaction_1.9.0.201606071900.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.edit_2.12.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.change_2.11.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.validation_1.8.0.201606071713.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.expressions_3.5.100.v20160418-1621.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.ide_3.12.3.v20170119-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sasheditor.di_2.0.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sasheditor_2.0.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.widgets_2.0.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.databinding_1.6.0.v20160412-0910.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.views.properties.tabbed_3.7.0.v20160310-0903.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.forms_3.7.1.v20161220-1635.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.views_3.8.102.v20170111-0801.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.services.labelprovider_1.2.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.jface.text_3.11.2.v20170220-1911.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.text_3.6.0.v20160503-1849.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.3.201810170111.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.parser_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.common_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.emf.util_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.cst.parser_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.ecore.imperativeocl_3.4.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.project_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.runtime_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.diagram.ui_1.8.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gef_3.11.0.201606061308.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.draw2d_3.10.100.201606061308.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.workspace_1.5.1.201606071900.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.clipboard.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.ui_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.action_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.services.action_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.services_1.9.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui_1.8.1.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.console_3.6.201.v20161107-0337.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.workbench.texteditor_3.10.1.v20160818-1626.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.team.core_3.8.0.v20160418-1534.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.type.core_1.9.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.commands.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.gef.ui_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.draw2d.ui_1.9.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.notation_1.8.0.201606071631.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.diagram.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.debug.core_3.10.100.v20160419-1720.jar"/>
-    </path>
-
-    <path id="org.polarsys.chess.mobius.classpath">
-        <path refid="org.polarsys.chess.mobius.libraryclasspath"/>
-    </path>
-
-    <!-- The classpath with only the jars available in the plugin folder of Eclipse -->
-    <path id="org.polarsys.chess.mobius.libraryclasspath.alljars">
-        <pathelement location="../org.polarsys.chess.mobius/bin"/>
-        <fileset dir="${ECLIPSE_HOME}/plugins/" includes="*.jar"/>
-    </path>
-
-    <path id="org.polarsys.chess.mobius.classpath.alljars">
-        <path refid="org.polarsys.chess.mobius.libraryclasspath.alljars"/>
-    </path>
-
-    <!-- The default task with the jars used by this project -->
-    <target name="atomicComponentRewardTemplate">
-        <java classname="org.polarsys.chess.mobius.templates.AtomicComponentRewardTemplate" classpathref="org.polarsys.chess.mobius.classpath">
-            <arg value="${model}"/>
-            <arg value="${target}"/>
-        </java>
-    </target>
-
-    <!--
-        In case of problem you can also try with all the jar available in your Eclipse
-        Keep in mind that having two versions of the same jar can create problems
-    -->
-    <target name="atomicComponentRewardTemplate.alljars">
-        <java classname="org.polarsys.chess.mobius.templates.AtomicComponentRewardTemplate" classpathref="org.polarsys.chess.mobius.classpath">
-            <arg value="${model}"/>
-            <arg value="${target}"/>
-        </java>
-    </target>
-</project>
diff --git a/plugins/mobius/org.polarsys.chess.mobius/tasks/atomicComponentTemplate.xml b/plugins/mobius/org.polarsys.chess.mobius/tasks/atomicComponentTemplate.xml
deleted file mode 100644
index 618c9ab..0000000
--- a/plugins/mobius/org.polarsys.chess.mobius/tasks/atomicComponentTemplate.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="atomicComponentTemplate" name="org.polarsys.chess.mobius">
-    <property name="ECLIPSE_HOME" value="../../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515"/>
-    <property name="ECLIPSE_WORKSPACE" value="../../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515/runtime-New_configuration_3"/>
-
-    <!-- The classpath with only the dependencies used by the project -->
-    <path id="org.polarsys.chess.mobius.libraryclasspath">
-        <pathelement location="${ECLIPSE_WORKSPACE}/org.polarsys.chess.mobius/bin"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/resources.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/rt.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/jsse.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/jce.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/charsets.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/jfr.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/access-bridge-64.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/cldrdata.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/dnsns.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/jaccess.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/jfxrt.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/localedata.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/nashorn.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunec.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunjce_provider.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunmscapi.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunpkcs11.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/zipfs.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui_3.108.1.v20160929-1045.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt_3.105.3.v20170228-0512.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt.win32.win32.x86_64_3.105.3.v20170228-0512.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.jface_3.12.2.v20170113-2113.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.commands_3.8.1.v20161221-1651.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.workbench_3.108.3.v20170216-1539.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.resources_3.11.1.v20161107-2032.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.engine_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.common_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.model_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore_2.12.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.common_2.12.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.xmi_2.12.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.profiler_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl.ecore_3.6.0.v20160523-1914.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl_3.6.0.v20160523-1914.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/lpg.runtime.java_2.0.17.v201004271640.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl.common_1.4.0.v20160521-2033.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen.ecore_2.12.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.uml_5.2.3.v20170227-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.common_2.1.0.v20170227-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.types_2.0.0.v20170227-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.mapping.ecore2xml_2.9.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.polarsys.chess.service_0.11.0.201812071049.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.polarsys.chess.core_0.9.0.201812071049.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.editor_1.3.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.ui_1.3.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core_2.1.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.tools_2.0.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.log_1.2.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/javax.inject_1.0.0.v20091030.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi_3.11.3.v20170209-1843.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.fx.osgi_2.4.0.201605100504.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.registry_3.6.100.v20160223-2218.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.preferences_3.6.1.v20160815-1406.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.contenttype_3.5.100.v20160418-1621.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/com.google.guava_15.0.0.v201403281430.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.databinding.observable_1.6.0.v20160511-1747.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sashwindows.di_1.2.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.transaction_1.9.0.201606071900.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.edit_2.12.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.change_2.11.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.validation_1.8.0.201606071713.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.expressions_3.5.100.v20160418-1621.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.ide_3.12.3.v20170119-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sasheditor.di_2.0.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sasheditor_2.0.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.widgets_2.0.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.databinding_1.6.0.v20160412-0910.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.views.properties.tabbed_3.7.0.v20160310-0903.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.forms_3.7.1.v20161220-1635.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.views_3.8.102.v20170111-0801.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.services.labelprovider_1.2.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.jface.text_3.11.2.v20170220-1911.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.text_3.6.0.v20160503-1849.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.3.201810170111.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.parser_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.common_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.emf.util_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.cst.parser_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.ecore.imperativeocl_3.4.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.project_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.runtime_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.diagram.ui_1.8.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gef_3.11.0.201606061308.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.draw2d_3.10.100.201606061308.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.workspace_1.5.1.201606071900.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.clipboard.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.ui_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.action_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.services.action_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.services_1.9.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui_1.8.1.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.console_3.6.201.v20161107-0337.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.workbench.texteditor_3.10.1.v20160818-1626.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.team.core_3.8.0.v20160418-1534.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.type.core_1.9.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.commands.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.gef.ui_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.draw2d.ui_1.9.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.notation_1.8.0.201606071631.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.diagram.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.debug.core_3.10.100.v20160419-1720.jar"/>
-    </path>
-
-    <path id="org.polarsys.chess.mobius.classpath">
-        <path refid="org.polarsys.chess.mobius.libraryclasspath"/>
-    </path>
-
-    <!-- The classpath with only the jars available in the plugin folder of Eclipse -->
-    <path id="org.polarsys.chess.mobius.libraryclasspath.alljars">
-        <pathelement location="../org.polarsys.chess.mobius/bin"/>
-        <fileset dir="${ECLIPSE_HOME}/plugins/" includes="*.jar"/>
-    </path>
-
-    <path id="org.polarsys.chess.mobius.classpath.alljars">
-        <path refid="org.polarsys.chess.mobius.libraryclasspath.alljars"/>
-    </path>
-
-    <!-- The default task with the jars used by this project -->
-    <target name="atomicComponentTemplate">
-        <java classname="org.polarsys.chess.mobius.templates.AtomicComponentTemplate" classpathref="org.polarsys.chess.mobius.classpath">
-            <arg value="${model}"/>
-            <arg value="${target}"/>
-        </java>
-    </target>
-
-    <!--
-        In case of problem you can also try with all the jar available in your Eclipse
-        Keep in mind that having two versions of the same jar can create problems
-    -->
-    <target name="atomicComponentTemplate.alljars">
-        <java classname="org.polarsys.chess.mobius.templates.AtomicComponentTemplate" classpathref="org.polarsys.chess.mobius.classpath">
-            <arg value="${model}"/>
-            <arg value="${target}"/>
-        </java>
-    </target>
-</project>
diff --git a/plugins/mobius/org.polarsys.chess.mobius/tasks/atomicComponentTemplateTarget.xml b/plugins/mobius/org.polarsys.chess.mobius/tasks/atomicComponentTemplateTarget.xml
deleted file mode 100644
index da1622b..0000000
--- a/plugins/mobius/org.polarsys.chess.mobius/tasks/atomicComponentTemplateTarget.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Place this file in the target project and call it with "External Tools > Run As > Ant Build" -->
-<!-- You have to change the MODEL and the TARGET values -->
-
-<project basedir="." default="atomicComponentTemplateSample" name="org.polarsys.chess.mobiusSample">
-	<import file="../../org.polarsys.chess.mobius/tasks/atomicComponentTemplate.xml"/>
-
-    <!-- Change the values of MODEL and TARGET to point to your model and output folder -->
-	<property name="MODEL" value="${basedir}/model/file.xmi"/>
-	<property name="TARGET" value="${basedir}/src-gen"/>
-
-	<target name="atomicComponentTemplateSample" description="Generate files in 'TARGET'">
-		<antcall target="atomicComponentTemplate" >
-			<param name="model" value="${MODEL}"/>
-			<param name="target" value="${TARGET}"/>
-		</antcall>
-	</target>
-</project>
diff --git a/plugins/mobius/org.polarsys.chess.mobius/tasks/atomicComponentTemplate_fromSANmodel.xml b/plugins/mobius/org.polarsys.chess.mobius/tasks/atomicComponentTemplate_fromSANmodel.xml
deleted file mode 100644
index ffea269..0000000
--- a/plugins/mobius/org.polarsys.chess.mobius/tasks/atomicComponentTemplate_fromSANmodel.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="atomicComponentTemplate_fromSANmodel" name="org.polarsys.chess.mobius">
-    <property name="ECLIPSE_HOME" value="../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515"/>
-    <property name="ECLIPSE_WORKSPACE" value="../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515/runtime-New_configuration"/>
-
-    <!-- The classpath with only the dependencies used by the project -->
-    <path id="org.polarsys.chess.mobius.libraryclasspath">
-        <pathelement location="${ECLIPSE_WORKSPACE}/org.polarsys.chess.mobius/bin"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/resources.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/rt.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/jsse.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/jce.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/charsets.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/jfr.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/access-bridge-64.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/cldrdata.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/dnsns.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/jaccess.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/jfxrt.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/localedata.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/nashorn.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunec.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunjce_provider.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunmscapi.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunpkcs11.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/zipfs.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui_3.108.1.v20160929-1045.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt_3.105.3.v20170228-0512.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt.win32.win32.x86_64_3.105.3.v20170228-0512.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.jface_3.12.2.v20170113-2113.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.commands_3.8.1.v20161221-1651.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.workbench_3.108.3.v20170216-1539.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.resources_3.11.1.v20161107-2032.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.engine_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.common_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.model_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore_2.12.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.common_2.12.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.xmi_2.12.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.profiler_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl.ecore_3.6.0.v20160523-1914.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl_3.6.0.v20160523-1914.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/lpg.runtime.java_2.0.17.v201004271640.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl.common_1.4.0.v20160521-2033.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen.ecore_2.12.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/workspace_san/org.eclipse.uml2.uml/bin"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.common_2.1.0.v20170227-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.types_2.0.0.v20170227-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.mapping.ecore2xml_2.9.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.polarsys.chess.service_0.11.0.201812071049.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.polarsys.chess.core_0.9.0.201812071049.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.editor_1.3.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.ui_1.3.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core_2.1.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.tools_2.0.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.log_1.2.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/javax.inject_1.0.0.v20091030.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi_3.11.3.v20170209-1843.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.fx.osgi_2.4.0.201605100504.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.registry_3.6.100.v20160223-2218.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.preferences_3.6.1.v20160815-1406.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.contenttype_3.5.100.v20160418-1621.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/com.google.guava_15.0.0.v201403281430.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.databinding.observable_1.6.0.v20160511-1747.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sashwindows.di_1.2.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.transaction_1.9.0.201606071900.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.edit_2.12.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.change_2.11.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.validation_1.8.0.201606071713.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.expressions_3.5.100.v20160418-1621.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.ide_3.12.3.v20170119-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sasheditor.di_2.0.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sasheditor_2.0.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.widgets_2.0.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.databinding_1.6.0.v20160412-0910.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.views.properties.tabbed_3.7.0.v20160310-0903.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.forms_3.7.1.v20161220-1635.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.views_3.8.102.v20170111-0801.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.services.labelprovider_1.2.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.jface.text_3.11.2.v20170220-1911.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.text_3.6.0.v20160503-1849.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.3.201810170111.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.parser_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.common_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.emf.util_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.cst.parser_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.ecore.imperativeocl_3.4.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.project_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.runtime_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.diagram.ui_1.8.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gef_3.11.0.201606061308.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.draw2d_3.10.100.201606061308.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.workspace_1.5.1.201606071900.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.clipboard.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.ui_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.action_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.services.action_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.services_1.9.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui_1.8.1.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.console_3.6.201.v20161107-0337.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.workbench.texteditor_3.10.1.v20160818-1626.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.team.core_3.8.0.v20160418-1534.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.type.core_1.9.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.commands.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.gef.ui_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.draw2d.ui_1.9.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.notation_1.8.0.201606071631.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.diagram.core_1.7.0.201606071959.jar"/>
-    </path>
-
-    <path id="org.polarsys.chess.mobius.classpath">
-        <path refid="org.polarsys.chess.mobius.libraryclasspath"/>
-    </path>
-
-    <!-- The classpath with only the jars available in the plugin folder of Eclipse -->
-    <path id="org.polarsys.chess.mobius.libraryclasspath.alljars">
-        <pathelement location="../org.polarsys.chess.mobius/bin"/>
-        <fileset dir="${ECLIPSE_HOME}/plugins/" includes="*.jar"/>
-    </path>
-
-    <path id="org.polarsys.chess.mobius.classpath.alljars">
-        <path refid="org.polarsys.chess.mobius.libraryclasspath.alljars"/>
-    </path>
-
-    <!-- The default task with the jars used by this project -->
-    <target name="atomicComponentTemplate_fromSANmodel">
-        <java classname="org.polarsys.chess.mobius.templates.AtomicComponentTemplate_fromSANmodel" classpathref="org.polarsys.chess.mobius.classpath">
-            <arg value="${model}"/>
-            <arg value="${target}"/>
-        </java>
-    </target>
-
-    <!--
-        In case of problem you can also try with all the jar available in your Eclipse
-        Keep in mind that having two versions of the same jar can create problems
-    -->
-    <target name="atomicComponentTemplate_fromSANmodel.alljars">
-        <java classname="org.polarsys.chess.mobius.templates.AtomicComponentTemplate_fromSANmodel" classpathref="org.polarsys.chess.mobius.classpath">
-            <arg value="${model}"/>
-            <arg value="${target}"/>
-        </java>
-    </target>
-</project>
diff --git a/plugins/mobius/org.polarsys.chess.mobius/tasks/atomicComponentTemplate_sanmodel.xml b/plugins/mobius/org.polarsys.chess.mobius/tasks/atomicComponentTemplate_sanmodel.xml
index c88ba22..f54e5e9 100644
--- a/plugins/mobius/org.polarsys.chess.mobius/tasks/atomicComponentTemplate_sanmodel.xml
+++ b/plugins/mobius/org.polarsys.chess.mobius/tasks/atomicComponentTemplate_sanmodel.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project default="atomicComponentTemplate_sanmodel" name="org.polarsys.chess.mobius">
-    <property name="ECLIPSE_HOME" value="../../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515"/>
-    <property name="ECLIPSE_WORKSPACE" value="../../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515/runtime-New_configuration_3"/>
+    <property name="ECLIPSE_HOME" value="../../../../../../EclipseCHESS-Neon-win32-x86_64_1.0.0RC1"/>
+    <property name="ECLIPSE_WORKSPACE" value="../../../../../../runtime-EclipseApplication"/>
 
     <!-- The classpath with only the dependencies used by the project -->
     <path id="org.polarsys.chess.mobius.libraryclasspath">
@@ -49,8 +49,6 @@
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.common_2.1.0.v20170227-0935.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.types_2.0.0.v20170227-0935.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.mapping.ecore2xml_2.9.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.polarsys.chess.service_0.11.0.201812071049.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.polarsys.chess.core_0.9.0.201812071049.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.editor_1.3.0.201703080851.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.ui_1.3.0.201703080851.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core_2.1.1.201703080851.jar"/>
@@ -86,7 +84,7 @@
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.services.labelprovider_1.2.1.201703080851.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.jface.text_3.11.2.v20170220-1911.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.text_3.6.0.v20160503-1849.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.3.201810170111.jar"/>
+        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.0.201703081153.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.parser_3.6.6.201610060831.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml_3.6.0.v20160606-1156.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.common_3.6.0.v20160606-1156.jar"/>
@@ -114,7 +112,6 @@
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.commands.core_1.7.0.201606071959.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.gef.ui_1.7.0.201606071959.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.draw2d.ui_1.9.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.notation_1.8.0.201606071631.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.diagram.core_1.7.0.201606071959.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.debug.core_3.10.100.v20160419-1720.jar"/>
     </path>
diff --git a/plugins/mobius/org.polarsys.chess.mobius/tasks/attackScenarioTemplate.xml b/plugins/mobius/org.polarsys.chess.mobius/tasks/attackScenarioTemplate.xml
deleted file mode 100644
index 2e95607..0000000
--- a/plugins/mobius/org.polarsys.chess.mobius/tasks/attackScenarioTemplate.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="AttackScenarioTemplate" name="org.polarsys.chess.mobius">
-    <property name="ECLIPSE_HOME" value="../../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515"/>
-    <property name="ECLIPSE_WORKSPACE" value="../../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515/runtime-New_configuration_3"/>
-
-    <!-- The classpath with only the dependencies used by the project -->
-    <path id="org.polarsys.chess.mobius.libraryclasspath">
-        <pathelement location="${ECLIPSE_WORKSPACE}/org.polarsys.chess.mobius/bin"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/resources.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/rt.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/jsse.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/jce.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/charsets.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/jfr.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/access-bridge-64.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/cldrdata.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/dnsns.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/jaccess.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/jfxrt.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/localedata.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/nashorn.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunec.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunjce_provider.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunmscapi.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunpkcs11.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/zipfs.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui_3.108.1.v20160929-1045.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt_3.105.3.v20170228-0512.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt.win32.win32.x86_64_3.105.3.v20170228-0512.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.jface_3.12.2.v20170113-2113.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.commands_3.8.1.v20161221-1651.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.workbench_3.108.3.v20170216-1539.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.resources_3.11.1.v20161107-2032.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.engine_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.common_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.model_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore_2.12.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.common_2.12.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.xmi_2.12.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.profiler_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl.ecore_3.6.0.v20160523-1914.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl_3.6.0.v20160523-1914.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/lpg.runtime.java_2.0.17.v201004271640.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl.common_1.4.0.v20160521-2033.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen.ecore_2.12.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.uml_5.2.3.v20170227-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.common_2.1.0.v20170227-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.types_2.0.0.v20170227-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.mapping.ecore2xml_2.9.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.polarsys.chess.service_0.11.0.201812071049.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.polarsys.chess.core_0.9.0.201812071049.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.editor_1.3.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.ui_1.3.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core_2.1.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.tools_2.0.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.log_1.2.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/javax.inject_1.0.0.v20091030.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi_3.11.3.v20170209-1843.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.fx.osgi_2.4.0.201605100504.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.registry_3.6.100.v20160223-2218.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.preferences_3.6.1.v20160815-1406.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.contenttype_3.5.100.v20160418-1621.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/com.google.guava_15.0.0.v201403281430.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.databinding.observable_1.6.0.v20160511-1747.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sashwindows.di_1.2.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.transaction_1.9.0.201606071900.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.edit_2.12.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.change_2.11.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.validation_1.8.0.201606071713.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.expressions_3.5.100.v20160418-1621.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.ide_3.12.3.v20170119-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sasheditor.di_2.0.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sasheditor_2.0.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.widgets_2.0.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.databinding_1.6.0.v20160412-0910.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.views.properties.tabbed_3.7.0.v20160310-0903.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.forms_3.7.1.v20161220-1635.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.views_3.8.102.v20170111-0801.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.services.labelprovider_1.2.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.jface.text_3.11.2.v20170220-1911.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.text_3.6.0.v20160503-1849.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.3.201810170111.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.parser_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.common_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.emf.util_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.cst.parser_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.ecore.imperativeocl_3.4.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.project_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.runtime_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.diagram.ui_1.8.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gef_3.11.0.201606061308.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.draw2d_3.10.100.201606061308.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.workspace_1.5.1.201606071900.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.clipboard.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.ui_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.action_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.services.action_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.services_1.9.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui_1.8.1.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.console_3.6.201.v20161107-0337.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.workbench.texteditor_3.10.1.v20160818-1626.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.team.core_3.8.0.v20160418-1534.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.type.core_1.9.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.commands.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.gef.ui_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.draw2d.ui_1.9.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.notation_1.8.0.201606071631.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.diagram.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.debug.core_3.10.100.v20160419-1720.jar"/>
-    </path>
-
-    <path id="org.polarsys.chess.mobius.classpath">
-        <path refid="org.polarsys.chess.mobius.libraryclasspath"/>
-    </path>
-
-    <!-- The classpath with only the jars available in the plugin folder of Eclipse -->
-    <path id="org.polarsys.chess.mobius.libraryclasspath.alljars">
-        <pathelement location="../org.polarsys.chess.mobius/bin"/>
-        <fileset dir="${ECLIPSE_HOME}/plugins/" includes="*.jar"/>
-    </path>
-
-    <path id="org.polarsys.chess.mobius.classpath.alljars">
-        <path refid="org.polarsys.chess.mobius.libraryclasspath.alljars"/>
-    </path>
-
-    <!-- The default task with the jars used by this project -->
-    <target name="AttackScenarioTemplate">
-        <java classname="org.polarsys.chess.mobius.templates.AttackScenarioTemplate" classpathref="org.polarsys.chess.mobius.classpath">
-            <arg value="${model}"/>
-            <arg value="${target}"/>
-        </java>
-    </target>
-
-    <!--
-        In case of problem you can also try with all the jar available in your Eclipse
-        Keep in mind that having two versions of the same jar can create problems
-    -->
-    <target name="AttackScenarioTemplate.alljars">
-        <java classname="org.polarsys.chess.mobius.templates.AttackScenarioTemplate" classpathref="org.polarsys.chess.mobius.classpath">
-            <arg value="${model}"/>
-            <arg value="${target}"/>
-        </java>
-    </target>
-</project>
diff --git a/plugins/mobius/org.polarsys.chess.mobius/tasks/attackScenarioTemplateTarget.xml b/plugins/mobius/org.polarsys.chess.mobius/tasks/attackScenarioTemplateTarget.xml
deleted file mode 100644
index 303b743..0000000
--- a/plugins/mobius/org.polarsys.chess.mobius/tasks/attackScenarioTemplateTarget.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Place this file in the target project and call it with "External Tools > Run As > Ant Build" -->
-<!-- You have to change the MODEL and the TARGET values -->
-
-<project basedir="." default="AttackScenarioTemplateSample" name="org.polarsys.chess.mobiusSample">
-	<import file="../../org.polarsys.chess.mobius/tasks/AttackScenarioTemplate.xml"/>
-
-    <!-- Change the values of MODEL and TARGET to point to your model and output folder -->
-	<property name="MODEL" value="${basedir}/model/file.xmi"/>
-	<property name="TARGET" value="${basedir}/src-gen"/>
-
-	<target name="AttackScenarioTemplateSample" description="Generate files in 'TARGET'">
-		<antcall target="AttackScenarioTemplate" >
-			<param name="model" value="${MODEL}"/>
-			<param name="target" value="${TARGET}"/>
-		</antcall>
-	</target>
-</project>
diff --git a/plugins/mobius/org.polarsys.chess.mobius/tasks/attackSimpleTemplate.xml b/plugins/mobius/org.polarsys.chess.mobius/tasks/attackSimpleTemplate.xml
deleted file mode 100644
index d5310be..0000000
--- a/plugins/mobius/org.polarsys.chess.mobius/tasks/attackSimpleTemplate.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="attackSimpleTemplate" name="org.polarsys.chess.mobius">
-    <property name="ECLIPSE_HOME" value="../../../../../AQUAS/City/Eclipse"/>
-    <property name="ECLIPSE_WORKSPACE" value="../../../../../AQUAS/City/Workspace-aquas"/>
-
-    <!-- The classpath with only the dependencies used by the project -->
-    <path id="org.polarsys.chess.mobius.libraryclasspath">
-        <pathelement location="${ECLIPSE_WORKSPACE}/org.polarsys.chess.mobius/bin"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui_3.108.1.v20160929-1045.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt_3.105.3.v20170228-0512.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt.win32.win32.x86_64_3.105.3.v20170228-0512.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.jface_3.12.2.v20170113-2113.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.commands_3.8.1.v20161221-1651.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.workbench_3.108.3.v20170216-1539.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.resources_3.11.1.v20161107-2032.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.engine_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.common_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.model_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore_2.12.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.common_2.12.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.xmi_2.12.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.profiler_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl.ecore_3.6.0.v20160523-1914.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl_3.6.0.v20160523-1914.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/lpg.runtime.java_2.0.17.v201004271640.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl.common_1.4.0.v20160521-2033.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen.ecore_2.12.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.uml_5.2.3.v20170227-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.common_2.1.0.v20170227-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.types_2.0.0.v20170227-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.mapping.ecore2xml_2.9.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.editor_1.3.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.ui_1.3.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core_2.1.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.tools_2.0.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.log_1.2.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/javax.inject_1.0.0.v20091030.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi_3.11.3.v20170209-1843.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.fx.osgi_2.0.0.201506111452.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.registry_3.6.100.v20160223-2218.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.preferences_3.6.1.v20160815-1406.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.contenttype_3.5.100.v20160418-1621.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/com.google.guava_15.0.0.v201403281430.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.databinding.observable_1.6.0.v20160511-1747.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sashwindows.di_1.2.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.transaction_1.9.0.201606071900.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.edit_2.12.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.change_2.11.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.validation_1.8.0.201606071713.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.expressions_3.5.100.v20160418-1621.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.ide_3.12.3.v20170119-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sasheditor.di_2.0.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sasheditor_2.0.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.widgets_2.0.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.databinding_1.6.0.v20160412-0910.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.views.properties.tabbed_3.7.0.v20160310-0903.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.forms_3.7.1.v20161220-1635.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.views_3.8.102.v20170111-0801.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.services.labelprovider_1.2.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.jface.text_3.11.2.v20170220-1911.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.text_3.6.0.v20160503-1849.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.3.201903150152.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.parser_3.6.6.201610060831.jar"/>
-    </path>
-
-    <path id="org.polarsys.chess.mobius.classpath">
-        <path refid="org.polarsys.chess.mobius.libraryclasspath"/>
-    </path>
-
-    <!-- The classpath with only the jars available in the plugin folder of Eclipse -->
-    <path id="org.polarsys.chess.mobius.libraryclasspath.alljars">
-        <pathelement location="../org.polarsys.chess.mobius/bin"/>
-        <fileset dir="${ECLIPSE_HOME}/plugins/" includes="*.jar"/>
-    </path>
-
-    <path id="org.polarsys.chess.mobius.classpath.alljars">
-        <path refid="org.polarsys.chess.mobius.libraryclasspath.alljars"/>
-    </path>
-
-    <!-- The default task with the jars used by this project -->
-    <target name="attackSimpleTemplate">
-        <java classname="org.polarsys.chess.mobius.templates.AttackSimpleTemplate" classpathref="org.polarsys.chess.mobius.classpath">
-            <arg value="${model}"/>
-            <arg value="${target}"/>
-        </java>
-    </target>
-
-    <!--
-        In case of problem you can also try with all the jar available in your Eclipse
-        Keep in mind that having two versions of the same jar can create problems
-    -->
-    <target name="attackSimpleTemplate.alljars">
-        <java classname="org.polarsys.chess.mobius.templates.AttackSimpleTemplate" classpathref="org.polarsys.chess.mobius.classpath">
-            <arg value="${model}"/>
-            <arg value="${target}"/>
-        </java>
-    </target>
-</project>
diff --git a/plugins/mobius/org.polarsys.chess.mobius/tasks/attackSimpleTemplateTarget.xml b/plugins/mobius/org.polarsys.chess.mobius/tasks/attackSimpleTemplateTarget.xml
deleted file mode 100644
index 85abf33..0000000
--- a/plugins/mobius/org.polarsys.chess.mobius/tasks/attackSimpleTemplateTarget.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Place this file in the target project and call it with "External Tools > Run As > Ant Build" -->
-<!-- You have to change the MODEL and the TARGET values -->
-
-<project basedir="." default="attackSimpleTemplateSample" name="org.polarsys.chess.mobiusSample">
-	<import file="../../org.polarsys.chess.mobius/tasks/attackSimpleTemplate.xml"/>
-
-    <!-- Change the values of MODEL and TARGET to point to your model and output folder -->
-	<property name="MODEL" value="${basedir}/model/file.xmi"/>
-	<property name="TARGET" value="${basedir}/src-gen"/>
-
-	<target name="attackSimpleTemplateSample" description="Generate files in 'TARGET'">
-		<antcall target="attackSimpleTemplate" >
-			<param name="model" value="${MODEL}"/>
-			<param name="target" value="${TARGET}"/>
-		</antcall>
-	</target>
-</project>
diff --git a/plugins/mobius/org.polarsys.chess.mobius/tasks/attackTemplate.xml b/plugins/mobius/org.polarsys.chess.mobius/tasks/attackTemplate.xml
deleted file mode 100644
index 515f0b4..0000000
--- a/plugins/mobius/org.polarsys.chess.mobius/tasks/attackTemplate.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="attackTemplate" name="org.polarsys.chess.mobius">
-    <property name="ECLIPSE_HOME" value="../../../../../AQUAS/City/Eclipse"/>
-    <property name="ECLIPSE_WORKSPACE" value="../../../../../AQUAS/City/Workspace-aquas"/>
-
-    <!-- The classpath with only the dependencies used by the project -->
-    <path id="org.polarsys.chess.mobius.libraryclasspath">
-        <pathelement location="${ECLIPSE_WORKSPACE}/org.polarsys.chess.mobius/bin"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui_3.108.1.v20160929-1045.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt_3.105.3.v20170228-0512.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt.win32.win32.x86_64_3.105.3.v20170228-0512.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.jface_3.12.2.v20170113-2113.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.commands_3.8.1.v20161221-1651.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.workbench_3.108.3.v20170216-1539.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.resources_3.11.1.v20161107-2032.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.engine_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.common_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.model_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore_2.12.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.common_2.12.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.xmi_2.12.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.profiler_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl.ecore_3.6.0.v20160523-1914.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl_3.6.0.v20160523-1914.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/lpg.runtime.java_2.0.17.v201004271640.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl.common_1.4.0.v20160521-2033.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen.ecore_2.12.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.uml_5.2.3.v20170227-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.common_2.1.0.v20170227-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.types_2.0.0.v20170227-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.mapping.ecore2xml_2.9.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.editor_1.3.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.ui_1.3.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core_2.1.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.tools_2.0.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.log_1.2.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/javax.inject_1.0.0.v20091030.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi_3.11.3.v20170209-1843.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.fx.osgi_2.0.0.201506111452.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.registry_3.6.100.v20160223-2218.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.preferences_3.6.1.v20160815-1406.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.contenttype_3.5.100.v20160418-1621.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/com.google.guava_15.0.0.v201403281430.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.databinding.observable_1.6.0.v20160511-1747.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sashwindows.di_1.2.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.transaction_1.9.0.201606071900.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.edit_2.12.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.change_2.11.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.validation_1.8.0.201606071713.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.expressions_3.5.100.v20160418-1621.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.ide_3.12.3.v20170119-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sasheditor.di_2.0.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sasheditor_2.0.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.widgets_2.0.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.databinding_1.6.0.v20160412-0910.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.views.properties.tabbed_3.7.0.v20160310-0903.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.forms_3.7.1.v20161220-1635.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.views_3.8.102.v20170111-0801.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.services.labelprovider_1.2.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.jface.text_3.11.2.v20170220-1911.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.text_3.6.0.v20160503-1849.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.3.201903150152.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.parser_3.6.6.201610060831.jar"/>
-    </path>
-
-    <path id="org.polarsys.chess.mobius.classpath">
-        <path refid="org.polarsys.chess.mobius.libraryclasspath"/>
-    </path>
-
-    <!-- The classpath with only the jars available in the plugin folder of Eclipse -->
-    <path id="org.polarsys.chess.mobius.libraryclasspath.alljars">
-        <pathelement location="../org.polarsys.chess.mobius/bin"/>
-        <fileset dir="${ECLIPSE_HOME}/plugins/" includes="*.jar"/>
-    </path>
-
-    <path id="org.polarsys.chess.mobius.classpath.alljars">
-        <path refid="org.polarsys.chess.mobius.libraryclasspath.alljars"/>
-    </path>
-
-    <!-- The default task with the jars used by this project -->
-    <target name="attackTemplate">
-        <java classname="org.polarsys.chess.mobius.templates.AttackTemplate" classpathref="org.polarsys.chess.mobius.classpath">
-            <arg value="${model}"/>
-            <arg value="${target}"/>
-        </java>
-    </target>
-
-    <!--
-        In case of problem you can also try with all the jar available in your Eclipse
-        Keep in mind that having two versions of the same jar can create problems
-    -->
-    <target name="attackTemplate.alljars">
-        <java classname="org.polarsys.chess.mobius.templates.AttackTemplate" classpathref="org.polarsys.chess.mobius.classpath">
-            <arg value="${model}"/>
-            <arg value="${target}"/>
-        </java>
-    </target>
-</project>
diff --git a/plugins/mobius/org.polarsys.chess.mobius/tasks/attackTemplateTarget.xml b/plugins/mobius/org.polarsys.chess.mobius/tasks/attackTemplateTarget.xml
deleted file mode 100644
index d567d54..0000000
--- a/plugins/mobius/org.polarsys.chess.mobius/tasks/attackTemplateTarget.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Place this file in the target project and call it with "External Tools > Run As > Ant Build" -->
-<!-- You have to change the MODEL and the TARGET values -->
-
-<project basedir="." default="attackTemplateSample" name="org.polarsys.chess.mobiusSample">
-	<import file="../../org.polarsys.chess.mobius/tasks/attackTemplate.xml"/>
-
-    <!-- Change the values of MODEL and TARGET to point to your model and output folder -->
-	<property name="MODEL" value="${basedir}/model/file.xmi"/>
-	<property name="TARGET" value="${basedir}/src-gen"/>
-
-	<target name="attackTemplateSample" description="Generate files in 'TARGET'">
-		<antcall target="attackTemplate" >
-			<param name="model" value="${MODEL}"/>
-			<param name="target" value="${TARGET}"/>
-		</antcall>
-	</target>
-</project>
diff --git a/plugins/mobius/org.polarsys.chess.mobius/tasks/composedComponentTemplate.xml b/plugins/mobius/org.polarsys.chess.mobius/tasks/composedComponentTemplate.xml
deleted file mode 100644
index 747b250..0000000
--- a/plugins/mobius/org.polarsys.chess.mobius/tasks/composedComponentTemplate.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="composedComponentTemplate" name="org.polarsys.chess.mobius">
-    <property name="ECLIPSE_HOME" value="../../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515"/>
-    <property name="ECLIPSE_WORKSPACE" value="../../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515/runtime-New_configuration_3"/>
-
-    <!-- The classpath with only the dependencies used by the project -->
-    <path id="org.polarsys.chess.mobius.libraryclasspath">
-        <pathelement location="${ECLIPSE_WORKSPACE}/org.polarsys.chess.mobius/bin"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/resources.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/rt.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/jsse.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/jce.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/charsets.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/jfr.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/access-bridge-64.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/cldrdata.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/dnsns.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/jaccess.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/jfxrt.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/localedata.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/nashorn.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunec.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunjce_provider.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunmscapi.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunpkcs11.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/zipfs.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui_3.108.1.v20160929-1045.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt_3.105.3.v20170228-0512.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt.win32.win32.x86_64_3.105.3.v20170228-0512.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.jface_3.12.2.v20170113-2113.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.commands_3.8.1.v20161221-1651.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.workbench_3.108.3.v20170216-1539.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.resources_3.11.1.v20161107-2032.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.engine_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.common_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.model_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore_2.12.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.common_2.12.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.xmi_2.12.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.profiler_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl.ecore_3.6.0.v20160523-1914.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl_3.6.0.v20160523-1914.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/lpg.runtime.java_2.0.17.v201004271640.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl.common_1.4.0.v20160521-2033.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen.ecore_2.12.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.uml_5.2.3.v20170227-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.common_2.1.0.v20170227-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.types_2.0.0.v20170227-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.mapping.ecore2xml_2.9.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.polarsys.chess.service_0.11.0.201812071049.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.polarsys.chess.core_0.9.0.201812071049.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.editor_1.3.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.ui_1.3.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core_2.1.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.tools_2.0.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.log_1.2.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/javax.inject_1.0.0.v20091030.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi_3.11.3.v20170209-1843.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.fx.osgi_2.4.0.201605100504.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.registry_3.6.100.v20160223-2218.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.preferences_3.6.1.v20160815-1406.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.contenttype_3.5.100.v20160418-1621.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/com.google.guava_15.0.0.v201403281430.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.databinding.observable_1.6.0.v20160511-1747.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sashwindows.di_1.2.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.transaction_1.9.0.201606071900.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.edit_2.12.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.change_2.11.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.validation_1.8.0.201606071713.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.expressions_3.5.100.v20160418-1621.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.ide_3.12.3.v20170119-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sasheditor.di_2.0.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sasheditor_2.0.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.widgets_2.0.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.databinding_1.6.0.v20160412-0910.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.views.properties.tabbed_3.7.0.v20160310-0903.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.forms_3.7.1.v20161220-1635.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.views_3.8.102.v20170111-0801.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.services.labelprovider_1.2.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.jface.text_3.11.2.v20170220-1911.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.text_3.6.0.v20160503-1849.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.3.201810170111.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.parser_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.common_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.emf.util_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.cst.parser_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.ecore.imperativeocl_3.4.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.project_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.runtime_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.diagram.ui_1.8.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gef_3.11.0.201606061308.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.draw2d_3.10.100.201606061308.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.workspace_1.5.1.201606071900.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.clipboard.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.ui_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.action_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.services.action_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.services_1.9.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui_1.8.1.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.console_3.6.201.v20161107-0337.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.workbench.texteditor_3.10.1.v20160818-1626.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.team.core_3.8.0.v20160418-1534.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.type.core_1.9.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.commands.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.gef.ui_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.draw2d.ui_1.9.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.notation_1.8.0.201606071631.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.diagram.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.debug.core_3.10.100.v20160419-1720.jar"/>
-    </path>
-
-    <path id="org.polarsys.chess.mobius.classpath">
-        <path refid="org.polarsys.chess.mobius.libraryclasspath"/>
-    </path>
-
-    <!-- The classpath with only the jars available in the plugin folder of Eclipse -->
-    <path id="org.polarsys.chess.mobius.libraryclasspath.alljars">
-        <pathelement location="../org.polarsys.chess.mobius/bin"/>
-        <fileset dir="${ECLIPSE_HOME}/plugins/" includes="*.jar"/>
-    </path>
-
-    <path id="org.polarsys.chess.mobius.classpath.alljars">
-        <path refid="org.polarsys.chess.mobius.libraryclasspath.alljars"/>
-    </path>
-
-    <!-- The default task with the jars used by this project -->
-    <target name="composedComponentTemplate">
-        <java classname="org.polarsys.chess.mobius.templates.ComposedComponentTemplate" classpathref="org.polarsys.chess.mobius.classpath">
-            <arg value="${model}"/>
-            <arg value="${target}"/>
-        </java>
-    </target>
-
-    <!--
-        In case of problem you can also try with all the jar available in your Eclipse
-        Keep in mind that having two versions of the same jar can create problems
-    -->
-    <target name="composedComponentTemplate.alljars">
-        <java classname="org.polarsys.chess.mobius.templates.ComposedComponentTemplate" classpathref="org.polarsys.chess.mobius.classpath">
-            <arg value="${model}"/>
-            <arg value="${target}"/>
-        </java>
-    </target>
-</project>
diff --git a/plugins/mobius/org.polarsys.chess.mobius/tasks/composedComponentTemplateTarget.xml b/plugins/mobius/org.polarsys.chess.mobius/tasks/composedComponentTemplateTarget.xml
deleted file mode 100644
index 9865c14..0000000
--- a/plugins/mobius/org.polarsys.chess.mobius/tasks/composedComponentTemplateTarget.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Place this file in the target project and call it with "External Tools > Run As > Ant Build" -->
-<!-- You have to change the MODEL and the TARGET values -->
-
-<project basedir="." default="composedComponentTemplateSample" name="org.polarsys.chess.mobiusSample">
-	<import file="../../org.polarsys.chess.mobius/tasks/composedComponentTemplate.xml"/>
-
-    <!-- Change the values of MODEL and TARGET to point to your model and output folder -->
-	<property name="MODEL" value="${basedir}/model/file.xmi"/>
-	<property name="TARGET" value="${basedir}/src-gen"/>
-
-	<target name="composedComponentTemplateSample" description="Generate files in 'TARGET'">
-		<antcall target="composedComponentTemplate" >
-			<param name="model" value="${MODEL}"/>
-			<param name="target" value="${TARGET}"/>
-		</antcall>
-	</target>
-</project>
diff --git a/plugins/mobius/org.polarsys.chess.mobius/tasks/composedComponentTemplate_sanmodel.xml b/plugins/mobius/org.polarsys.chess.mobius/tasks/composedComponentTemplate_sanmodel.xml
index 4fb7122..4421944 100644
--- a/plugins/mobius/org.polarsys.chess.mobius/tasks/composedComponentTemplate_sanmodel.xml
+++ b/plugins/mobius/org.polarsys.chess.mobius/tasks/composedComponentTemplate_sanmodel.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project default="composedComponentTemplate_sanmodel" name="org.polarsys.chess.mobius">
-    <property name="ECLIPSE_HOME" value="../../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515"/>
-    <property name="ECLIPSE_WORKSPACE" value="../../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515/runtime-New_configuration_3"/>
+    <property name="ECLIPSE_HOME" value="../../../../../../EclipseCHESS-Neon-win32-x86_64_1.0.0RC1"/>
+    <property name="ECLIPSE_WORKSPACE" value="../../../../../../runtime-EclipseApplication"/>
 
     <!-- The classpath with only the dependencies used by the project -->
     <path id="org.polarsys.chess.mobius.libraryclasspath">
@@ -49,8 +49,6 @@
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.common_2.1.0.v20170227-0935.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.types_2.0.0.v20170227-0935.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.mapping.ecore2xml_2.9.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.polarsys.chess.service_0.11.0.201812071049.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.polarsys.chess.core_0.9.0.201812071049.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.editor_1.3.0.201703080851.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.ui_1.3.0.201703080851.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core_2.1.1.201703080851.jar"/>
@@ -86,7 +84,7 @@
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.services.labelprovider_1.2.1.201703080851.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.jface.text_3.11.2.v20170220-1911.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.text_3.6.0.v20160503-1849.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.3.201810170111.jar"/>
+        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.0.201703081153.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.parser_3.6.6.201610060831.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml_3.6.0.v20160606-1156.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.common_3.6.0.v20160606-1156.jar"/>
@@ -114,7 +112,6 @@
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.commands.core_1.7.0.201606071959.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.gef.ui_1.7.0.201606071959.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.draw2d.ui_1.9.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.notation_1.8.0.201606071631.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.diagram.core_1.7.0.201606071959.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.debug.core_3.10.100.v20160419-1720.jar"/>
     </path>
diff --git a/plugins/mobius/org.polarsys.chess.mobius/tasks/projectFileTemplate.xml b/plugins/mobius/org.polarsys.chess.mobius/tasks/projectFileTemplate.xml
deleted file mode 100644
index 62521fa..0000000
--- a/plugins/mobius/org.polarsys.chess.mobius/tasks/projectFileTemplate.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="projectFileTemplate" name="org.polarsys.chess.mobius">
-    <property name="ECLIPSE_HOME" value="../../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515"/>
-    <property name="ECLIPSE_WORKSPACE" value="../../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515/runtime-New_configuration_3"/>
-
-    <!-- The classpath with only the dependencies used by the project -->
-    <path id="org.polarsys.chess.mobius.libraryclasspath">
-        <pathelement location="${ECLIPSE_WORKSPACE}/org.polarsys.chess.mobius/bin"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/resources.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/rt.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/jsse.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/jce.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/charsets.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/jfr.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/access-bridge-64.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/cldrdata.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/dnsns.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/jaccess.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/jfxrt.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/localedata.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/nashorn.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunec.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunjce_provider.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunmscapi.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunpkcs11.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/zipfs.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui_3.108.1.v20160929-1045.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt_3.105.3.v20170228-0512.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt.win32.win32.x86_64_3.105.3.v20170228-0512.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.jface_3.12.2.v20170113-2113.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.commands_3.8.1.v20161221-1651.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.workbench_3.108.3.v20170216-1539.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.resources_3.11.1.v20161107-2032.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.engine_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.common_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.model_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore_2.12.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.common_2.12.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.xmi_2.12.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.profiler_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl.ecore_3.6.0.v20160523-1914.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl_3.6.0.v20160523-1914.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/lpg.runtime.java_2.0.17.v201004271640.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl.common_1.4.0.v20160521-2033.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen.ecore_2.12.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.uml_5.2.3.v20170227-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.common_2.1.0.v20170227-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.types_2.0.0.v20170227-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.mapping.ecore2xml_2.9.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.polarsys.chess.service_0.11.0.201812071049.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.polarsys.chess.core_0.9.0.201812071049.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.editor_1.3.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.ui_1.3.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core_2.1.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.tools_2.0.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.log_1.2.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/javax.inject_1.0.0.v20091030.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi_3.11.3.v20170209-1843.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.fx.osgi_2.4.0.201605100504.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.registry_3.6.100.v20160223-2218.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.preferences_3.6.1.v20160815-1406.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.contenttype_3.5.100.v20160418-1621.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/com.google.guava_15.0.0.v201403281430.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.databinding.observable_1.6.0.v20160511-1747.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sashwindows.di_1.2.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.transaction_1.9.0.201606071900.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.edit_2.12.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.change_2.11.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.validation_1.8.0.201606071713.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.expressions_3.5.100.v20160418-1621.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.ide_3.12.3.v20170119-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sasheditor.di_2.0.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sasheditor_2.0.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.widgets_2.0.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.databinding_1.6.0.v20160412-0910.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.views.properties.tabbed_3.7.0.v20160310-0903.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.forms_3.7.1.v20161220-1635.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.views_3.8.102.v20170111-0801.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.services.labelprovider_1.2.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.jface.text_3.11.2.v20170220-1911.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.text_3.6.0.v20160503-1849.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.3.201810170111.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.parser_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.common_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.emf.util_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.cst.parser_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.ecore.imperativeocl_3.4.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.project_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.runtime_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.diagram.ui_1.8.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gef_3.11.0.201606061308.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.draw2d_3.10.100.201606061308.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.workspace_1.5.1.201606071900.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.clipboard.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.ui_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.action_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.services.action_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.services_1.9.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui_1.8.1.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.console_3.6.201.v20161107-0337.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.workbench.texteditor_3.10.1.v20160818-1626.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.team.core_3.8.0.v20160418-1534.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.type.core_1.9.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.commands.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.gef.ui_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.draw2d.ui_1.9.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.notation_1.8.0.201606071631.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.diagram.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.debug.core_3.10.100.v20160419-1720.jar"/>
-    </path>
-
-    <path id="org.polarsys.chess.mobius.classpath">
-        <path refid="org.polarsys.chess.mobius.libraryclasspath"/>
-    </path>
-
-    <!-- The classpath with only the jars available in the plugin folder of Eclipse -->
-    <path id="org.polarsys.chess.mobius.libraryclasspath.alljars">
-        <pathelement location="../org.polarsys.chess.mobius/bin"/>
-        <fileset dir="${ECLIPSE_HOME}/plugins/" includes="*.jar"/>
-    </path>
-
-    <path id="org.polarsys.chess.mobius.classpath.alljars">
-        <path refid="org.polarsys.chess.mobius.libraryclasspath.alljars"/>
-    </path>
-
-    <!-- The default task with the jars used by this project -->
-    <target name="projectFileTemplate">
-        <java classname="org.polarsys.chess.mobius.templates.ProjectFileTemplate" classpathref="org.polarsys.chess.mobius.classpath">
-            <arg value="${model}"/>
-            <arg value="${target}"/>
-        </java>
-    </target>
-
-    <!--
-        In case of problem you can also try with all the jar available in your Eclipse
-        Keep in mind that having two versions of the same jar can create problems
-    -->
-    <target name="projectFileTemplate.alljars">
-        <java classname="org.polarsys.chess.mobius.templates.ProjectFileTemplate" classpathref="org.polarsys.chess.mobius.classpath">
-            <arg value="${model}"/>
-            <arg value="${target}"/>
-        </java>
-    </target>
-</project>
diff --git a/plugins/mobius/org.polarsys.chess.mobius/tasks/projectFileTemplateTarget.xml b/plugins/mobius/org.polarsys.chess.mobius/tasks/projectFileTemplateTarget.xml
deleted file mode 100644
index c852080..0000000
--- a/plugins/mobius/org.polarsys.chess.mobius/tasks/projectFileTemplateTarget.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Place this file in the target project and call it with "External Tools > Run As > Ant Build" -->
-<!-- You have to change the MODEL and the TARGET values -->
-
-<project basedir="." default="projectFileTemplateSample" name="org.polarsys.chess.mobiusSample">
-	<import file="../../org.polarsys.chess.mobius/tasks/projectFileTemplate.xml"/>
-
-    <!-- Change the values of MODEL and TARGET to point to your model and output folder -->
-	<property name="MODEL" value="${basedir}/model/file.xmi"/>
-	<property name="TARGET" value="${basedir}/src-gen"/>
-
-	<target name="projectFileTemplateSample" description="Generate files in 'TARGET'">
-		<antcall target="projectFileTemplate" >
-			<param name="model" value="${MODEL}"/>
-			<param name="target" value="${TARGET}"/>
-		</antcall>
-	</target>
-</project>
diff --git a/plugins/mobius/org.polarsys.chess.mobius/tasks/projectFileTemplate_sanmodel.xml b/plugins/mobius/org.polarsys.chess.mobius/tasks/projectFileTemplate_sanmodel.xml
index 90e4732..ed93b0b 100644
--- a/plugins/mobius/org.polarsys.chess.mobius/tasks/projectFileTemplate_sanmodel.xml
+++ b/plugins/mobius/org.polarsys.chess.mobius/tasks/projectFileTemplate_sanmodel.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project default="projectFileTemplate_sanmodel" name="org.polarsys.chess.mobius">
-    <property name="ECLIPSE_HOME" value="../../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515"/>
-    <property name="ECLIPSE_WORKSPACE" value="../../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515/runtime-New_configuration_3"/>
+    <property name="ECLIPSE_HOME" value="../../../../../../EclipseCHESS-Neon-win32-x86_64_1.0.0RC1"/>
+    <property name="ECLIPSE_WORKSPACE" value="../../../../../../runtime-EclipseApplication"/>
 
     <!-- The classpath with only the dependencies used by the project -->
     <path id="org.polarsys.chess.mobius.libraryclasspath">
@@ -49,8 +49,6 @@
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.common_2.1.0.v20170227-0935.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.types_2.0.0.v20170227-0935.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.mapping.ecore2xml_2.9.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.polarsys.chess.service_0.11.0.201812071049.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.polarsys.chess.core_0.9.0.201812071049.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.editor_1.3.0.201703080851.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.ui_1.3.0.201703080851.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core_2.1.1.201703080851.jar"/>
@@ -86,7 +84,7 @@
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.services.labelprovider_1.2.1.201703080851.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.jface.text_3.11.2.v20170220-1911.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.text_3.6.0.v20160503-1849.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.3.201810170111.jar"/>
+        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.0.201703081153.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.parser_3.6.6.201610060831.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml_3.6.0.v20160606-1156.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.common_3.6.0.v20160606-1156.jar"/>
@@ -114,7 +112,6 @@
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.commands.core_1.7.0.201606071959.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.gef.ui_1.7.0.201606071959.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.draw2d.ui_1.9.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.notation_1.8.0.201606071631.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.diagram.core_1.7.0.201606071959.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.debug.core_3.10.100.v20160419-1720.jar"/>
     </path>
diff --git a/plugins/mobius/org.polarsys.chess.mobius/tasks/vulnerableComponentsTemplate.xml b/plugins/mobius/org.polarsys.chess.mobius/tasks/vulnerableComponentsTemplate.xml
deleted file mode 100644
index 7cb8182..0000000
--- a/plugins/mobius/org.polarsys.chess.mobius/tasks/vulnerableComponentsTemplate.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="vulnerableComponentsTemplate" name="org.polarsys.chess.mobius">
-    <property name="ECLIPSE_HOME" value="../../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515"/>
-    <property name="ECLIPSE_WORKSPACE" value="../../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515/runtime-New_configuration_3"/>
-
-    <!-- The classpath with only the dependencies used by the project -->
-    <path id="org.polarsys.chess.mobius.libraryclasspath">
-        <pathelement location="${ECLIPSE_WORKSPACE}/org.polarsys.chess.mobius/bin"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/resources.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/rt.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/jsse.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/jce.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/charsets.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/jfr.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/access-bridge-64.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/cldrdata.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/dnsns.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/jaccess.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/jfxrt.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/localedata.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/nashorn.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunec.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunjce_provider.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunmscapi.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunpkcs11.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/zipfs.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui_3.108.1.v20160929-1045.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt_3.105.3.v20170228-0512.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt.win32.win32.x86_64_3.105.3.v20170228-0512.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.jface_3.12.2.v20170113-2113.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.commands_3.8.1.v20161221-1651.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.workbench_3.108.3.v20170216-1539.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.resources_3.11.1.v20161107-2032.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.engine_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.common_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.model_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore_2.12.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.common_2.12.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.xmi_2.12.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.profiler_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl.ecore_3.6.0.v20160523-1914.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl_3.6.0.v20160523-1914.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/lpg.runtime.java_2.0.17.v201004271640.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl.common_1.4.0.v20160521-2033.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen.ecore_2.12.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.uml_5.2.3.v20170227-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.common_2.1.0.v20170227-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.types_2.0.0.v20170227-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.mapping.ecore2xml_2.9.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.polarsys.chess.service_0.11.0.201812071049.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.polarsys.chess.core_0.9.0.201812071049.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.editor_1.3.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.ui_1.3.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core_2.1.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.tools_2.0.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.log_1.2.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/javax.inject_1.0.0.v20091030.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi_3.11.3.v20170209-1843.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.fx.osgi_2.4.0.201605100504.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.registry_3.6.100.v20160223-2218.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.preferences_3.6.1.v20160815-1406.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.contenttype_3.5.100.v20160418-1621.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/com.google.guava_15.0.0.v201403281430.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.databinding.observable_1.6.0.v20160511-1747.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sashwindows.di_1.2.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.transaction_1.9.0.201606071900.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.edit_2.12.0.v20160526-0356.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.change_2.11.0.v20160420-0247.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.validation_1.8.0.201606071713.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.expressions_3.5.100.v20160418-1621.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.ide_3.12.3.v20170119-0935.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sasheditor.di_2.0.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sasheditor_2.0.0.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.widgets_2.0.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.databinding_1.6.0.v20160412-0910.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.views.properties.tabbed_3.7.0.v20160310-0903.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.forms_3.7.1.v20161220-1635.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.views_3.8.102.v20170111-0801.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.services.labelprovider_1.2.1.201703080851.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.jface.text_3.11.2.v20170220-1911.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.text_3.6.0.v20160503-1849.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.3.201810170111.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.parser_3.6.6.201610060831.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.common_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.emf.util_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.cst.parser_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.ecore.imperativeocl_3.4.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.project_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.runtime_3.6.0.v20160606-1156.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.diagram.ui_1.8.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gef_3.11.0.201606061308.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.draw2d_3.10.100.201606061308.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.workspace_1.5.1.201606071900.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.clipboard.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.ui_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.action_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.services.action_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui.services_1.9.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.common.ui_1.8.1.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.console_3.6.201.v20161107-0337.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.workbench.texteditor_3.10.1.v20160818-1626.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.team.core_3.8.0.v20160418-1534.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.type.core_1.9.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.emf.commands.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.gef.ui_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.draw2d.ui_1.9.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.notation_1.8.0.201606071631.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.gmf.runtime.diagram.core_1.7.0.201606071959.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.debug.core_3.10.100.v20160419-1720.jar"/>
-    </path>
-
-    <path id="org.polarsys.chess.mobius.classpath">
-        <path refid="org.polarsys.chess.mobius.libraryclasspath"/>
-    </path>
-
-    <!-- The classpath with only the jars available in the plugin folder of Eclipse -->
-    <path id="org.polarsys.chess.mobius.libraryclasspath.alljars">
-        <pathelement location="../org.polarsys.chess.mobius/bin"/>
-        <fileset dir="${ECLIPSE_HOME}/plugins/" includes="*.jar"/>
-    </path>
-
-    <path id="org.polarsys.chess.mobius.classpath.alljars">
-        <path refid="org.polarsys.chess.mobius.libraryclasspath.alljars"/>
-    </path>
-
-    <!-- The default task with the jars used by this project -->
-    <target name="vulnerableComponentsTemplate">
-        <java classname="org.polarsys.chess.mobius.templates.VulnerableComponentsTemplate" classpathref="org.polarsys.chess.mobius.classpath">
-            <arg value="${model}"/>
-            <arg value="${target}"/>
-        </java>
-    </target>
-
-    <!--
-        In case of problem you can also try with all the jar available in your Eclipse
-        Keep in mind that having two versions of the same jar can create problems
-    -->
-    <target name="vulnerableComponentsTemplate.alljars">
-        <java classname="org.polarsys.chess.mobius.templates.VulnerableComponentsTemplate" classpathref="org.polarsys.chess.mobius.classpath">
-            <arg value="${model}"/>
-            <arg value="${target}"/>
-        </java>
-    </target>
-</project>
diff --git a/plugins/mobius/org.polarsys.chess.mobius/tasks/vulnerableComponentsTemplateTarget.xml b/plugins/mobius/org.polarsys.chess.mobius/tasks/vulnerableComponentsTemplateTarget.xml
deleted file mode 100644
index eec845a..0000000
--- a/plugins/mobius/org.polarsys.chess.mobius/tasks/vulnerableComponentsTemplateTarget.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Place this file in the target project and call it with "External Tools > Run As > Ant Build" -->
-<!-- You have to change the MODEL and the TARGET values -->
-
-<project basedir="." default="vulnerableComponentsTemplateSample" name="org.polarsys.chess.mobiusSample">
-	<import file="../../org.polarsys.chess.mobius/tasks/vulnerableComponentsTemplate.xml"/>
-
-    <!-- Change the values of MODEL and TARGET to point to your model and output folder -->
-	<property name="MODEL" value="${basedir}/model/file.xmi"/>
-	<property name="TARGET" value="${basedir}/src-gen"/>
-
-	<target name="vulnerableComponentsTemplateSample" description="Generate files in 'TARGET'">
-		<antcall target="vulnerableComponentsTemplate" >
-			<param name="model" value="${MODEL}"/>
-			<param name="target" value="${TARGET}"/>
-		</antcall>
-	</target>
-</project>
diff --git a/plugins/org.polarsys.chess.OSSImporter/about.html b/plugins/org.polarsys.chess.OSSImporter/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/plugins/org.polarsys.chess.OSSImporter/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/commands/ImportOSSFileCommand.java b/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/commands/ImportOSSFileCommand.java
index cc6f7f1..e60daff 100644
--- a/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/commands/ImportOSSFileCommand.java
+++ b/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/commands/ImportOSSFileCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/core/actions/ImportOSSFileAction.java b/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/core/actions/ImportOSSFileAction.java
index ecd15b7..a6fa621 100644
--- a/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/core/actions/ImportOSSFileAction.java
+++ b/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/core/actions/ImportOSSFileAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/core/exceptions/ImportException.java b/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/core/exceptions/ImportException.java
index c815135..72f7030 100644
--- a/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/core/exceptions/ImportException.java
+++ b/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/core/exceptions/ImportException.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/core/utils/ChessElementsUtil.java b/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/core/utils/ChessElementsUtil.java
index 9c40f23..7bb68ed 100644
--- a/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/core/utils/ChessElementsUtil.java
+++ b/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/core/utils/ChessElementsUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2018 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *  

  * Contributors:

  *   Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/core/utils/OssTypeTranslator.java b/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/core/utils/OssTypeTranslator.java
index b80aaa1..de5348b 100644
--- a/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/core/utils/OssTypeTranslator.java
+++ b/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/core/utils/OssTypeTranslator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2018 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *  

  * Contributors:

  *   Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/core/utils/StereotypeUtil.java b/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/core/utils/StereotypeUtil.java
index 3cf229e..bed61db 100644
--- a/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/core/utils/StereotypeUtil.java
+++ b/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/core/utils/StereotypeUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2018 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *  

  * Contributors:

  *   Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.cdo/about.html b/plugins/org.polarsys.chess.cdo/about.html
index dd3c089..164f781 100644
--- a/plugins/org.polarsys.chess.cdo/about.html
+++ b/plugins/org.polarsys.chess.cdo/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>November 14, 2008</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/Activator.java b/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/Activator.java
index 843ee94..623b5a5 100644
--- a/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/Activator.java
+++ b/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/Activator.java
@@ -1,54 +1,61 @@
-package org.polarsys.chess.cdo;
-
-import org.eclipse.papyrus.infra.core.log.LogHelper;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.polarsys.chess.cdo"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-
-	/** Logging helper */
-	public static LogHelper log = new LogHelper();
-
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-		super();
-	}
-
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-
-		// register the log helper
-		log.setPlugin(plugin);
-
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		log = null;
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

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

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

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

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

+package org.polarsys.chess.cdo;

+

+import org.eclipse.papyrus.infra.core.log.LogHelper;

+import org.eclipse.ui.plugin.AbstractUIPlugin;

+import org.osgi.framework.BundleContext;

+

+/**

+ * The activator class controls the plug-in life cycle

+ */

+public class Activator extends AbstractUIPlugin {

+

+	// The plug-in ID

+	public static final String PLUGIN_ID = "org.polarsys.chess.cdo"; //$NON-NLS-1$

+

+	// The shared instance

+	private static Activator plugin;

+

+	/** Logging helper */

+	public static LogHelper log = new LogHelper();

+

+	/**

+	 * The constructor

+	 */

+	public Activator() {

+		super();

+	}

+

+	@Override

+	public void start(BundleContext context) throws Exception {

+		super.start(context);

+		plugin = this;

+

+		// register the log helper

+		log.setPlugin(plugin);

+

+	}

+

+	@Override

+	public void stop(BundleContext context) throws Exception {

+		log = null;

+		plugin = null;

+		super.stop(context);

+	}

+

+	/**

+	 * Returns the shared instance

+	 *

+	 * @return the shared instance

+	 */

+	public static Activator getDefault() {

+		return plugin;

+	}

+

+}

diff --git a/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/dialogs/CDOExportDialog.java b/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/dialogs/CDOExportDialog.java
index 15fa5de..6cc18d3 100644
--- a/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/dialogs/CDOExportDialog.java
+++ b/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/dialogs/CDOExportDialog.java
@@ -1,178 +1,185 @@
-package org.polarsys.chess.cdo.dialogs;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.cdo.dawn.preferences.PreferenceConstants;
-import org.eclipse.emf.cdo.dawn.util.connection.CDOConnectionUtil;
-import org.eclipse.emf.cdo.eresource.CDOResourceFolder;
-import org.eclipse.emf.cdo.session.CDOSession;
-import org.eclipse.emf.cdo.transaction.CDOTransaction;
-import org.eclipse.emf.cdo.view.CDOView;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.polarsys.chess.cdo.dialogs.utils.DialogUtil;
-import org.polarsys.chess.cdo.providers.CDOResourceListLabelProvider;
-import org.polarsys.chess.cdo.providers.CHESSProjectListLabelProvider;
-
-public class CDOExportDialog extends TitleAreaDialog {
-	
-	private static final String CHESS_NATURE = "org.polarsys.chess.CHESSNature";
-	private ComboViewer chessModelsCombo;
-	private ComboViewer cdoFoldersCombo;
-	private CDOView view;
-	private CDOTransaction transaction;
-	
-	private IProject selectedCHESSProject;
-	private CDOResourceFolder selectedCDOFolder;
-
-
-	public CDOExportDialog(Shell shell) throws Exception{
-		super(shell);
-		CDOConnectionUtil.instance.init(
-				//TODO These three lines should be kept if the preference page is available
-				PreferenceConstants.getRepositoryName(),
-				PreferenceConstants.getProtocol(),
-				PreferenceConstants.getServerName()
-//				"repo",
-//				"tcp",
-//				"localhost"
-				);
-		CDOSession session = CDOConnectionUtil.instance.openSession();
-		transaction = CDOConnectionUtil.instance.openTransaction(session);
-		view = CDOConnectionUtil.instance.openView(session);
-	}
-	
-	
-	@Override
-    public void create() {
-		setHelpAvailable(false);
-        super.create();
-        setTitle("Export CHESS project to CDO");
-        setMessage("Select CHESS project and CDO folder and click OK to perform the export", IMessageProvider.INFORMATION);
-    }
-	
-	@Override
-	protected Control createDialogArea(Composite parent) { 
-		parent.setLayout(new GridLayout(2, false));
-		
-		Label chessModelsLabel = new Label(parent, SWT.NONE);
-		chessModelsLabel.setText("Select a CHESS project: ");
-		
-		chessModelsCombo = new ComboViewer(parent, SWT.NONE);
-		chessModelsCombo.getCombo().setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
-		
-		chessModelsCombo.setContentProvider(new ArrayContentProvider());
-		chessModelsCombo.setLabelProvider(new CHESSProjectListLabelProvider());
-		
-		
-		Label cdoFoldersLabel = new Label(parent, SWT.NONE);
-		cdoFoldersLabel.setText("Select the target CDO Folder: ");
-		
-		cdoFoldersCombo = new ComboViewer(parent, SWT.NONE);
-		cdoFoldersCombo.getCombo().setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
-		
-		cdoFoldersCombo.setContentProvider(new ArrayContentProvider());
-		cdoFoldersCombo.setLabelProvider(new CDOResourceListLabelProvider());
-		
-		addCHESSModelsFromWorkspace();
-		addCDOFoldersFromRepository();
-		
-		return super.createDialogArea(parent);
-
-	}
-	
-	private void addCDOFoldersFromRepository() {
-		
-		List<CDOResourceFolder> folderList = DialogUtil.getAllFolders(view);
-		
-		cdoFoldersCombo.setInput(folderList.toArray());
-		cdoFoldersCombo.setComparator(new ViewerComparator() {
-			public int compare(
-					Viewer viewer, Object c1, Object c2) {
-				return ((CDOResourceFolder) c1).getPath().compareToIgnoreCase(((CDOResourceFolder) c2).getPath());
-			}
-		});
-	}
-
-
-	private void addCHESSModelsFromWorkspace() {
-		List<IProject> chessProjects = new ArrayList<>();
-		IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-		for(IProject project : projects){
-			try {
-				if(project.isOpen() && project.hasNature(CHESS_NATURE)){
-					chessProjects.add(project);
-				}
-			} catch (CoreException e) {
-				e.printStackTrace();
-			}
-		}
-		chessModelsCombo.setInput(chessProjects.toArray());
-		chessModelsCombo.setComparator(new ViewerComparator() {
-			public int compare(
-					Viewer viewer, Object c1, Object c2) {
-				return ((IProject) c1).getName().compareToIgnoreCase(((IProject) c2).getName());
-			}
-		});
-	}
-
-	@Override
-	protected boolean isResizable() {
-		return true;
-	}
-	
-	@Override
-    protected void okPressed() {
-		IProject chessProject = (IProject)((IStructuredSelection)chessModelsCombo.getSelection()).getFirstElement();
-		CDOResourceFolder cdoFolder = (CDOResourceFolder)((IStructuredSelection)cdoFoldersCombo.getSelection()).getFirstElement();
-		if(chessProject == null || cdoFolder == null){
-			setMessage("Please select CHESS model and CDO Folder!", IMessageProvider.ERROR);
-		}else{
-			setSelectedCHESSProject(chessProject);
-			setSelectedCDOFolder(cdoFolder);
-			super.okPressed();
-		}
-    }
-
-
-	public IProject getSelectedCHESSProject() {
-		return selectedCHESSProject;
-	}
-
-
-	public void setSelectedCHESSProject(IProject selectedCHESSProject) {
-		this.selectedCHESSProject = selectedCHESSProject;
-	}
-
-
-	public CDOResourceFolder getSelectedCDOFolder() {
-		return selectedCDOFolder;
-	}
-
-
-	public void setSelectedCDOFolder(CDOResourceFolder selectedCDOFolder) {
-		this.selectedCDOFolder = selectedCDOFolder;
-	}
-
-
-	public CDOTransaction getTransaction() {
-		return transaction;
-	}
-
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

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

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

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

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

+package org.polarsys.chess.cdo.dialogs;

+

+import java.util.ArrayList;

+import java.util.List;

+

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

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

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

+import org.eclipse.emf.cdo.dawn.preferences.PreferenceConstants;

+import org.eclipse.emf.cdo.dawn.util.connection.CDOConnectionUtil;

+import org.eclipse.emf.cdo.eresource.CDOResourceFolder;

+import org.eclipse.emf.cdo.session.CDOSession;

+import org.eclipse.emf.cdo.transaction.CDOTransaction;

+import org.eclipse.emf.cdo.view.CDOView;

+import org.eclipse.jface.dialogs.IMessageProvider;

+import org.eclipse.jface.dialogs.TitleAreaDialog;

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

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

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

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

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

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.layout.GridData;

+import org.eclipse.swt.layout.GridLayout;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Control;

+import org.eclipse.swt.widgets.Label;

+import org.eclipse.swt.widgets.Shell;

+import org.polarsys.chess.cdo.dialogs.utils.DialogUtil;

+import org.polarsys.chess.cdo.providers.CDOResourceListLabelProvider;

+import org.polarsys.chess.cdo.providers.CHESSProjectListLabelProvider;

+

+public class CDOExportDialog extends TitleAreaDialog {

+	

+	private static final String CHESS_NATURE = "org.polarsys.chess.CHESSNature";

+	private ComboViewer chessModelsCombo;

+	private ComboViewer cdoFoldersCombo;

+	private CDOView view;

+	private CDOTransaction transaction;

+	

+	private IProject selectedCHESSProject;

+	private CDOResourceFolder selectedCDOFolder;

+

+

+	public CDOExportDialog(Shell shell) throws Exception{

+		super(shell);

+		CDOConnectionUtil.instance.init(

+				//TODO These three lines should be kept if the preference page is available

+				PreferenceConstants.getRepositoryName(),

+				PreferenceConstants.getProtocol(),

+				PreferenceConstants.getServerName()

+//				"repo",

+//				"tcp",

+//				"localhost"

+				);

+		CDOSession session = CDOConnectionUtil.instance.openSession();

+		transaction = CDOConnectionUtil.instance.openTransaction(session);

+		view = CDOConnectionUtil.instance.openView(session);

+	}

+	

+	

+	@Override

+    public void create() {

+		setHelpAvailable(false);

+        super.create();

+        setTitle("Export CHESS project to CDO");

+        setMessage("Select CHESS project and CDO folder and click OK to perform the export", IMessageProvider.INFORMATION);

+    }

+	

+	@Override

+	protected Control createDialogArea(Composite parent) { 

+		parent.setLayout(new GridLayout(2, false));

+		

+		Label chessModelsLabel = new Label(parent, SWT.NONE);

+		chessModelsLabel.setText("Select a CHESS project: ");

+		

+		chessModelsCombo = new ComboViewer(parent, SWT.NONE);

+		chessModelsCombo.getCombo().setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));

+		

+		chessModelsCombo.setContentProvider(new ArrayContentProvider());

+		chessModelsCombo.setLabelProvider(new CHESSProjectListLabelProvider());

+		

+		

+		Label cdoFoldersLabel = new Label(parent, SWT.NONE);

+		cdoFoldersLabel.setText("Select the target CDO Folder: ");

+		

+		cdoFoldersCombo = new ComboViewer(parent, SWT.NONE);

+		cdoFoldersCombo.getCombo().setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));

+		

+		cdoFoldersCombo.setContentProvider(new ArrayContentProvider());

+		cdoFoldersCombo.setLabelProvider(new CDOResourceListLabelProvider());

+		

+		addCHESSModelsFromWorkspace();

+		addCDOFoldersFromRepository();

+		

+		return super.createDialogArea(parent);

+

+	}

+	

+	private void addCDOFoldersFromRepository() {

+		

+		List<CDOResourceFolder> folderList = DialogUtil.getAllFolders(view);

+		

+		cdoFoldersCombo.setInput(folderList.toArray());

+		cdoFoldersCombo.setComparator(new ViewerComparator() {

+			public int compare(

+					Viewer viewer, Object c1, Object c2) {

+				return ((CDOResourceFolder) c1).getPath().compareToIgnoreCase(((CDOResourceFolder) c2).getPath());

+			}

+		});

+	}

+

+

+	private void addCHESSModelsFromWorkspace() {

+		List<IProject> chessProjects = new ArrayList<>();

+		IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();

+		for(IProject project : projects){

+			try {

+				if(project.isOpen() && project.hasNature(CHESS_NATURE)){

+					chessProjects.add(project);

+				}

+			} catch (CoreException e) {

+				e.printStackTrace();

+			}

+		}

+		chessModelsCombo.setInput(chessProjects.toArray());

+		chessModelsCombo.setComparator(new ViewerComparator() {

+			public int compare(

+					Viewer viewer, Object c1, Object c2) {

+				return ((IProject) c1).getName().compareToIgnoreCase(((IProject) c2).getName());

+			}

+		});

+	}

+

+	@Override

+	protected boolean isResizable() {

+		return true;

+	}

+	

+	@Override

+    protected void okPressed() {

+		IProject chessProject = (IProject)((IStructuredSelection)chessModelsCombo.getSelection()).getFirstElement();

+		CDOResourceFolder cdoFolder = (CDOResourceFolder)((IStructuredSelection)cdoFoldersCombo.getSelection()).getFirstElement();

+		if(chessProject == null || cdoFolder == null){

+			setMessage("Please select CHESS model and CDO Folder!", IMessageProvider.ERROR);

+		}else{

+			setSelectedCHESSProject(chessProject);

+			setSelectedCDOFolder(cdoFolder);

+			super.okPressed();

+		}

+    }

+

+

+	public IProject getSelectedCHESSProject() {

+		return selectedCHESSProject;

+	}

+

+

+	public void setSelectedCHESSProject(IProject selectedCHESSProject) {

+		this.selectedCHESSProject = selectedCHESSProject;

+	}

+

+

+	public CDOResourceFolder getSelectedCDOFolder() {

+		return selectedCDOFolder;

+	}

+

+

+	public void setSelectedCDOFolder(CDOResourceFolder selectedCDOFolder) {

+		this.selectedCDOFolder = selectedCDOFolder;

+	}

+

+

+	public CDOTransaction getTransaction() {

+		return transaction;

+	}

+

+}

diff --git a/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/dialogs/CDOImportDialog.java b/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/dialogs/CDOImportDialog.java
index c6993cf..06467f8 100644
--- a/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/dialogs/CDOImportDialog.java
+++ b/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/dialogs/CDOImportDialog.java
@@ -1,192 +1,199 @@
-package org.polarsys.chess.cdo.dialogs;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.cdo.common.lob.CDOBlob;
-import org.eclipse.emf.cdo.dawn.preferences.PreferenceConstants;
-import org.eclipse.emf.cdo.dawn.util.connection.CDOConnectionUtil;
-import org.eclipse.emf.cdo.eresource.CDOBinaryResource;
-import org.eclipse.emf.cdo.eresource.CDOResourceFolder;
-import org.eclipse.emf.cdo.eresource.CDOResourceNode;
-import org.eclipse.emf.cdo.session.CDOSession;
-import org.eclipse.emf.cdo.transaction.CDOTransaction;
-import org.eclipse.emf.cdo.view.CDOView;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.polarsys.chess.cdo.dialogs.utils.DialogUtil;
-import org.polarsys.chess.cdo.providers.CDOResourceListLabelProvider;
-
-public class CDOImportDialog extends TitleAreaDialog {
-	
-	private CDOView view;
-	private CDOTransaction transaction;
-	private ComboViewer cdoCHESSProjectsCombo;
-	private Text projectNameText;
-	
-	private String newProjectName;
-	private CDOResourceFolder selectedCHESSProjectCDO;
-
-	public CDOImportDialog(Shell shell) {
-		super(shell);
-		CDOConnectionUtil.instance.init(
-				//TODO These three lines should be kept if the preference page is available
-				PreferenceConstants.getRepositoryName(),
-				PreferenceConstants.getProtocol(),
-				PreferenceConstants.getServerName()
-//				"repo",
-//				"tcp",
-//				"localhost"
-				);
-		CDOSession session = CDOConnectionUtil.instance.openSession();
-		transaction = CDOConnectionUtil.instance.openTransaction(session);
-		view = CDOConnectionUtil.instance.openView(session);
-	}
-	
-	@Override
-    public void create() {
-		setHelpAvailable(false);
-        super.create();
-        setTitle("Import CHESS project from CDO");
-        setMessage("Select a CHESS project from the CDO repository. Enter the project name and click OK to perform the import", IMessageProvider.INFORMATION);
-    }
-	
-	@Override
-	protected Control createDialogArea(Composite parent) { 
-		parent.setLayout(new GridLayout(2, false));
-		
-		Label chessModelsLabel = new Label(parent, SWT.NONE);
-		chessModelsLabel.setText("Select a CHESS project: ");
-		
-		cdoCHESSProjectsCombo = new ComboViewer(parent, SWT.NONE);
-		cdoCHESSProjectsCombo.getCombo().setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
-		
-		cdoCHESSProjectsCombo.setContentProvider(new ArrayContentProvider());
-		cdoCHESSProjectsCombo.setLabelProvider(new CDOResourceListLabelProvider());
-		ISelectionChangedListener listener = new ISelectionChangedListener(){
-
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				String text = cdoCHESSProjectsCombo.getCombo().getText();
-				text = text.substring(text.lastIndexOf(File.separator)+1);
-				projectNameText.setText(text);
-			}
-		};
-		
-		cdoCHESSProjectsCombo.addSelectionChangedListener(listener);
-		
-		Label cdoFoldersLabel = new Label(parent, SWT.NONE);
-		cdoFoldersLabel.setText("Enter the Project Name: ");
-		projectNameText = new Text(parent, SWT.BORDER);
-		projectNameText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
-		projectNameText.setText("");
-		
-		addCHESSProjectsFromCDORepository();
-		
-		return super.createDialogArea(parent);
-	}
-	
-	private void addCHESSProjectsFromCDORepository() {
-		List<CDOResourceFolder> folderList = DialogUtil.getAllFolders(view);
-		List<CDOResourceFolder> chessProjectsCDO = new ArrayList<>();
-		
-		for(CDOResourceFolder folder : folderList){
-//			System.out.println(folder.getName());
-			EList<CDOResourceNode> nodes = folder.getNodes();
-			for(CDOResourceNode node : nodes){
-//				System.out.println("--> " + node.toString());
-				if(node instanceof CDOBinaryResource && node.getName().equals(".project")){
-					CDOBinaryResource projectRes = (CDOBinaryResource) node;
-					CDOBlob contents = projectRes.getContents();
-//					System.out.println("----> " + contents.toString());
-					if(contents != null){
-						try {
-							InputStream is = contents.getContents();
-							ByteArrayOutputStream result = new ByteArrayOutputStream();
-							byte[] buffer = new byte[(int) contents.getSize()];
-							int length;
-							while ((length = is.read(buffer)) != -1) {
-								result.write(buffer, 0, length);
-							}
-							String contentsAsString =  result.toString("UTF-8");
-							//						System.out.println("------------> " + contentsAsString);
-							if (contentsAsString.contains("org.polarsys.chess.CHESSNature")){
-								chessProjectsCDO.add(folder);
-							}
-						} catch (IOException e) {
-							// TODO Auto-generated catch block
-							e.printStackTrace();
-						}
-					}
-				}
-			}
-		}
-		
-		cdoCHESSProjectsCombo.setInput(chessProjectsCDO.toArray());
-		cdoCHESSProjectsCombo.setComparator(new ViewerComparator() {
-			public int compare(
-					Viewer viewer, Object c1, Object c2) {
-				return ((CDOResourceFolder) c1).getPath().compareToIgnoreCase(((CDOResourceFolder) c2).getPath());
-			}
-		});
-	}
-
-	@Override
-	protected boolean isResizable() {
-		return true;
-	}
-	
-	@Override
-    protected void okPressed() {
-		CDOResourceFolder cdoCHESSFolder = (CDOResourceFolder)((IStructuredSelection)cdoCHESSProjectsCombo.getSelection()).getFirstElement();
-		String projectName = projectNameText.getText();
-		if(cdoCHESSFolder == null || projectName == null || projectName.isEmpty()){
-			setMessage("Please select CHESS project (from CDO) and enter the name of the new project!", IMessageProvider.ERROR);
-		}else{
-			setNewProjectName(projectName);
-			setSelectedCHESSProjectCDO(cdoCHESSFolder);
-			super.okPressed();
-		}
-	}
-	
-	public CDOResourceFolder getSelectedCHESSProjectCDO() {
-		return selectedCHESSProjectCDO;
-	}
-
-	public void setSelectedCHESSProjectCDO(CDOResourceFolder selectedCHESSProjectCDO) {
-		this.selectedCHESSProjectCDO = selectedCHESSProjectCDO;
-	}
-
-	public String getNewProjectName() {
-		return newProjectName;
-	}
-
-	public void setNewProjectName(String newProjectName) {
-		this.newProjectName = newProjectName;
-	}
-
-	public CDOTransaction getTransaction() {
-		return transaction;
-	}
-
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

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

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

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

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

+package org.polarsys.chess.cdo.dialogs;

+

+import java.io.ByteArrayOutputStream;

+import java.io.File;

+import java.io.IOException;

+import java.io.InputStream;

+import java.util.ArrayList;

+import java.util.List;

+

+import org.eclipse.emf.cdo.common.lob.CDOBlob;

+import org.eclipse.emf.cdo.dawn.preferences.PreferenceConstants;

+import org.eclipse.emf.cdo.dawn.util.connection.CDOConnectionUtil;

+import org.eclipse.emf.cdo.eresource.CDOBinaryResource;

+import org.eclipse.emf.cdo.eresource.CDOResourceFolder;

+import org.eclipse.emf.cdo.eresource.CDOResourceNode;

+import org.eclipse.emf.cdo.session.CDOSession;

+import org.eclipse.emf.cdo.transaction.CDOTransaction;

+import org.eclipse.emf.cdo.view.CDOView;

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

+import org.eclipse.jface.dialogs.IMessageProvider;

+import org.eclipse.jface.dialogs.TitleAreaDialog;

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

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

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

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

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

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

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

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.layout.GridData;

+import org.eclipse.swt.layout.GridLayout;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Control;

+import org.eclipse.swt.widgets.Label;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.swt.widgets.Text;

+import org.polarsys.chess.cdo.dialogs.utils.DialogUtil;

+import org.polarsys.chess.cdo.providers.CDOResourceListLabelProvider;

+

+public class CDOImportDialog extends TitleAreaDialog {

+	

+	private CDOView view;

+	private CDOTransaction transaction;

+	private ComboViewer cdoCHESSProjectsCombo;

+	private Text projectNameText;

+	

+	private String newProjectName;

+	private CDOResourceFolder selectedCHESSProjectCDO;

+

+	public CDOImportDialog(Shell shell) {

+		super(shell);

+		CDOConnectionUtil.instance.init(

+				//TODO These three lines should be kept if the preference page is available

+				PreferenceConstants.getRepositoryName(),

+				PreferenceConstants.getProtocol(),

+				PreferenceConstants.getServerName()

+//				"repo",

+//				"tcp",

+//				"localhost"

+				);

+		CDOSession session = CDOConnectionUtil.instance.openSession();

+		transaction = CDOConnectionUtil.instance.openTransaction(session);

+		view = CDOConnectionUtil.instance.openView(session);

+	}

+	

+	@Override

+    public void create() {

+		setHelpAvailable(false);

+        super.create();

+        setTitle("Import CHESS project from CDO");

+        setMessage("Select a CHESS project from the CDO repository. Enter the project name and click OK to perform the import", IMessageProvider.INFORMATION);

+    }

+	

+	@Override

+	protected Control createDialogArea(Composite parent) { 

+		parent.setLayout(new GridLayout(2, false));

+		

+		Label chessModelsLabel = new Label(parent, SWT.NONE);

+		chessModelsLabel.setText("Select a CHESS project: ");

+		

+		cdoCHESSProjectsCombo = new ComboViewer(parent, SWT.NONE);

+		cdoCHESSProjectsCombo.getCombo().setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));

+		

+		cdoCHESSProjectsCombo.setContentProvider(new ArrayContentProvider());

+		cdoCHESSProjectsCombo.setLabelProvider(new CDOResourceListLabelProvider());

+		ISelectionChangedListener listener = new ISelectionChangedListener(){

+

+			@Override

+			public void selectionChanged(SelectionChangedEvent event) {

+				String text = cdoCHESSProjectsCombo.getCombo().getText();

+				text = text.substring(text.lastIndexOf(File.separator)+1);

+				projectNameText.setText(text);

+			}

+		};

+		

+		cdoCHESSProjectsCombo.addSelectionChangedListener(listener);

+		

+		Label cdoFoldersLabel = new Label(parent, SWT.NONE);

+		cdoFoldersLabel.setText("Enter the Project Name: ");

+		projectNameText = new Text(parent, SWT.BORDER);

+		projectNameText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));

+		projectNameText.setText("");

+		

+		addCHESSProjectsFromCDORepository();

+		

+		return super.createDialogArea(parent);

+	}

+	

+	private void addCHESSProjectsFromCDORepository() {

+		List<CDOResourceFolder> folderList = DialogUtil.getAllFolders(view);

+		List<CDOResourceFolder> chessProjectsCDO = new ArrayList<>();

+		

+		for(CDOResourceFolder folder : folderList){

+//			System.out.println(folder.getName());

+			EList<CDOResourceNode> nodes = folder.getNodes();

+			for(CDOResourceNode node : nodes){

+//				System.out.println("--> " + node.toString());

+				if(node instanceof CDOBinaryResource && node.getName().equals(".project")){

+					CDOBinaryResource projectRes = (CDOBinaryResource) node;

+					CDOBlob contents = projectRes.getContents();

+//					System.out.println("----> " + contents.toString());

+					if(contents != null){

+						try {

+							InputStream is = contents.getContents();

+							ByteArrayOutputStream result = new ByteArrayOutputStream();

+							byte[] buffer = new byte[(int) contents.getSize()];

+							int length;

+							while ((length = is.read(buffer)) != -1) {

+								result.write(buffer, 0, length);

+							}

+							String contentsAsString =  result.toString("UTF-8");

+							//						System.out.println("------------> " + contentsAsString);

+							if (contentsAsString.contains("org.polarsys.chess.CHESSNature")){

+								chessProjectsCDO.add(folder);

+							}

+						} catch (IOException e) {

+							// TODO Auto-generated catch block

+							e.printStackTrace();

+						}

+					}

+				}

+			}

+		}

+		

+		cdoCHESSProjectsCombo.setInput(chessProjectsCDO.toArray());

+		cdoCHESSProjectsCombo.setComparator(new ViewerComparator() {

+			public int compare(

+					Viewer viewer, Object c1, Object c2) {

+				return ((CDOResourceFolder) c1).getPath().compareToIgnoreCase(((CDOResourceFolder) c2).getPath());

+			}

+		});

+	}

+

+	@Override

+	protected boolean isResizable() {

+		return true;

+	}

+	

+	@Override

+    protected void okPressed() {

+		CDOResourceFolder cdoCHESSFolder = (CDOResourceFolder)((IStructuredSelection)cdoCHESSProjectsCombo.getSelection()).getFirstElement();

+		String projectName = projectNameText.getText();

+		if(cdoCHESSFolder == null || projectName == null || projectName.isEmpty()){

+			setMessage("Please select CHESS project (from CDO) and enter the name of the new project!", IMessageProvider.ERROR);

+		}else{

+			setNewProjectName(projectName);

+			setSelectedCHESSProjectCDO(cdoCHESSFolder);

+			super.okPressed();

+		}

+	}

+	

+	public CDOResourceFolder getSelectedCHESSProjectCDO() {

+		return selectedCHESSProjectCDO;

+	}

+

+	public void setSelectedCHESSProjectCDO(CDOResourceFolder selectedCHESSProjectCDO) {

+		this.selectedCHESSProjectCDO = selectedCHESSProjectCDO;

+	}

+

+	public String getNewProjectName() {

+		return newProjectName;

+	}

+

+	public void setNewProjectName(String newProjectName) {

+		this.newProjectName = newProjectName;

+	}

+

+	public CDOTransaction getTransaction() {

+		return transaction;

+	}

+

+}

diff --git a/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/dialogs/utils/DialogUtil.java b/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/dialogs/utils/DialogUtil.java
index 873123e..8a1adfa 100644
--- a/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/dialogs/utils/DialogUtil.java
+++ b/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/dialogs/utils/DialogUtil.java
@@ -1,43 +1,50 @@
-package org.polarsys.chess.cdo.dialogs.utils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.cdo.eresource.CDOResourceFolder;
-import org.eclipse.emf.cdo.eresource.CDOResourceNode;
-import org.eclipse.emf.cdo.view.CDOView;
-import org.eclipse.emf.common.util.EList;
-
-public class DialogUtil {
-
-	public static List<CDOResourceFolder> getAllFolders(CDOView view) {
-		
-		List<CDOResourceFolder> folderList = new ArrayList<>();
-		
-		CDOResourceNode[] cdoElements = view.getElements(); 
-		for(CDOResourceNode cdoElem : cdoElements){
-			if(cdoElem instanceof CDOResourceFolder){
-				CDOResourceFolder cdoFolder = (CDOResourceFolder)cdoElem;
-				folderList.add(cdoFolder);
-				//check for subfolders
-				EList<CDOResourceNode> subNodes = cdoFolder.getNodes();
-				folderList = getSubFolders(subNodes,folderList);
-			}
-		}
-		
-		return folderList;
-	}
-
-	private static List<CDOResourceFolder> getSubFolders(EList<CDOResourceNode> nodes, List<CDOResourceFolder> folderList) {
-		for(CDOResourceNode cdoElem : nodes){
-			if(cdoElem instanceof CDOResourceFolder){
-				CDOResourceFolder cdoFolder = (CDOResourceFolder)cdoElem;
-				folderList.add(cdoFolder);
-				//check for subfolders
-				EList<CDOResourceNode> subNodes = cdoFolder.getNodes();
-				folderList = getSubFolders(subNodes,folderList);
-			}
-		}
-		return folderList;
-	}
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

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

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

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

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

+package org.polarsys.chess.cdo.dialogs.utils;

+

+import java.util.ArrayList;

+import java.util.List;

+

+import org.eclipse.emf.cdo.eresource.CDOResourceFolder;

+import org.eclipse.emf.cdo.eresource.CDOResourceNode;

+import org.eclipse.emf.cdo.view.CDOView;

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

+

+public class DialogUtil {

+

+	public static List<CDOResourceFolder> getAllFolders(CDOView view) {

+		

+		List<CDOResourceFolder> folderList = new ArrayList<>();

+		

+		CDOResourceNode[] cdoElements = view.getElements(); 

+		for(CDOResourceNode cdoElem : cdoElements){

+			if(cdoElem instanceof CDOResourceFolder){

+				CDOResourceFolder cdoFolder = (CDOResourceFolder)cdoElem;

+				folderList.add(cdoFolder);

+				//check for subfolders

+				EList<CDOResourceNode> subNodes = cdoFolder.getNodes();

+				folderList = getSubFolders(subNodes,folderList);

+			}

+		}

+		

+		return folderList;

+	}

+

+	private static List<CDOResourceFolder> getSubFolders(EList<CDOResourceNode> nodes, List<CDOResourceFolder> folderList) {

+		for(CDOResourceNode cdoElem : nodes){

+			if(cdoElem instanceof CDOResourceFolder){

+				CDOResourceFolder cdoFolder = (CDOResourceFolder)cdoElem;

+				folderList.add(cdoFolder);

+				//check for subfolders

+				EList<CDOResourceNode> subNodes = cdoFolder.getNodes();

+				folderList = getSubFolders(subNodes,folderList);

+			}

+		}

+		return folderList;

+	}

+}

diff --git a/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/handlers/CDOExportHandler.java b/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/handlers/CDOExportHandler.java
index 5e7f572..326e46e 100644
--- a/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/handlers/CDOExportHandler.java
+++ b/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/handlers/CDOExportHandler.java
@@ -1,77 +1,84 @@
-package org.polarsys.chess.cdo.handlers;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.cdo.eresource.CDOResourceFolder;
-import org.eclipse.emf.cdo.spi.transfer.FileSystemTransferSystem;
-import org.eclipse.emf.cdo.transaction.CDOTransaction;
-import org.eclipse.emf.cdo.transfer.CDOTransfer;
-import org.eclipse.emf.cdo.transfer.CDOTransferElement;
-import org.eclipse.emf.cdo.transfer.CDOTransferMapping;
-import org.eclipse.emf.cdo.transfer.CDOTransferSystem;
-import org.eclipse.emf.cdo.transfer.spi.repository.RepositoryTransferSystem;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.polarsys.chess.cdo.dialogs.CDOExportDialog;
-
-public class CDOExportHandler extends AbstractHandler {
-	
-	private String errorMsg = "";
-
-	@Override
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event);
-		
-		if(window != null){
-			Shell shell = window.getShell();
-			
-			//Show a dialog with a list of all the CHESS projects in the workspace and 
-			//and a list of the CDO folders (from the configured CDO repo).
-			//get the selected project and CDO folder and perform the copy from workspace to CDO.
-			CDOExportDialog dialog = null;
-			try{
-				dialog = new CDOExportDialog(shell);
-			}catch (Exception e){
-				MessageDialog.openError(shell, "Export CHESS Project to CDO", "Error: " + e.getMessage());
-			}
-
-			if(dialog != null && dialog.open() == Window.OK){
-				CDOResourceFolder cdoFolder = dialog.getSelectedCDOFolder();
-				IProject chessProject = dialog.getSelectedCHESSProject();
-				if(cdoFolder != null && chessProject != null){
-					CDOTransaction transaction = dialog.getTransaction();
-					try{
-						String filepath = chessProject.getLocation().toString();
-						CDOTransferElement source = FileSystemTransferSystem.INSTANCE.getElement(new Path(filepath));
-
-						CDOTransferSystem target = new RepositoryTransferSystem(transaction);
-						CDOTransfer transfer = new CDOTransfer(source.getSystem(), target);
-
-						CDOTransferMapping mapping = transfer.map(filepath, new NullProgressMonitor());
-						mapping.setRelativePath(cdoFolder.getPath() + "/" + chessProject.getName());
-						transfer.perform();
-
-						transaction.commit();
-						transaction.close();
-					} catch (Exception e) {
-						e.printStackTrace();
-						errorMsg = e.getMessage();
-					}
-				}
-			}
-			if(errorMsg != null && !errorMsg.isEmpty()){
-				MessageDialog.openError(shell, "Export CHESS Project to CDO", "Error: " + errorMsg);
-				errorMsg = "";
-			}
-		}
-		return null;
-	}
-
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

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

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

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

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

+package org.polarsys.chess.cdo.handlers;

+

+import org.eclipse.core.commands.AbstractHandler;

+import org.eclipse.core.commands.ExecutionEvent;

+import org.eclipse.core.commands.ExecutionException;

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

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

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

+import org.eclipse.emf.cdo.eresource.CDOResourceFolder;

+import org.eclipse.emf.cdo.spi.transfer.FileSystemTransferSystem;

+import org.eclipse.emf.cdo.transaction.CDOTransaction;

+import org.eclipse.emf.cdo.transfer.CDOTransfer;

+import org.eclipse.emf.cdo.transfer.CDOTransferElement;

+import org.eclipse.emf.cdo.transfer.CDOTransferMapping;

+import org.eclipse.emf.cdo.transfer.CDOTransferSystem;

+import org.eclipse.emf.cdo.transfer.spi.repository.RepositoryTransferSystem;

+import org.eclipse.jface.dialogs.MessageDialog;

+import org.eclipse.jface.window.Window;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.ui.IWorkbenchWindow;

+import org.eclipse.ui.handlers.HandlerUtil;

+import org.polarsys.chess.cdo.dialogs.CDOExportDialog;

+

+public class CDOExportHandler extends AbstractHandler {

+	

+	private String errorMsg = "";

+

+	@Override

+	public Object execute(ExecutionEvent event) throws ExecutionException {

+		IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event);

+		

+		if(window != null){

+			Shell shell = window.getShell();

+			

+			//Show a dialog with a list of all the CHESS projects in the workspace and 

+			//and a list of the CDO folders (from the configured CDO repo).

+			//get the selected project and CDO folder and perform the copy from workspace to CDO.

+			CDOExportDialog dialog = null;

+			try{

+				dialog = new CDOExportDialog(shell);

+			}catch (Exception e){

+				MessageDialog.openError(shell, "Export CHESS Project to CDO", "Error: " + e.getMessage());

+			}

+

+			if(dialog != null && dialog.open() == Window.OK){

+				CDOResourceFolder cdoFolder = dialog.getSelectedCDOFolder();

+				IProject chessProject = dialog.getSelectedCHESSProject();

+				if(cdoFolder != null && chessProject != null){

+					CDOTransaction transaction = dialog.getTransaction();

+					try{

+						String filepath = chessProject.getLocation().toString();

+						CDOTransferElement source = FileSystemTransferSystem.INSTANCE.getElement(new Path(filepath));

+

+						CDOTransferSystem target = new RepositoryTransferSystem(transaction);

+						CDOTransfer transfer = new CDOTransfer(source.getSystem(), target);

+

+						CDOTransferMapping mapping = transfer.map(filepath, new NullProgressMonitor());

+						mapping.setRelativePath(cdoFolder.getPath() + "/" + chessProject.getName());

+						transfer.perform();

+

+						transaction.commit();

+						transaction.close();

+					} catch (Exception e) {

+						e.printStackTrace();

+						errorMsg = e.getMessage();

+					}

+				}

+			}

+			if(errorMsg != null && !errorMsg.isEmpty()){

+				MessageDialog.openError(shell, "Export CHESS Project to CDO", "Error: " + errorMsg);

+				errorMsg = "";

+			}

+		}

+		return null;

+	}

+

+}

diff --git a/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/handlers/CDOImportHandler.java b/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/handlers/CDOImportHandler.java
index c2f607e..e2755a7 100644
--- a/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/handlers/CDOImportHandler.java
+++ b/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/handlers/CDOImportHandler.java
@@ -1,106 +1,113 @@
-package org.polarsys.chess.cdo.handlers;
-
-import java.io.File;
-import java.net.URI;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.cdo.eresource.CDOResourceFolder;
-import org.eclipse.emf.cdo.eresource.CDOResourceNode;
-import org.eclipse.emf.cdo.spi.transfer.FileSystemTransferSystem;
-import org.eclipse.emf.cdo.transaction.CDOTransaction;
-import org.eclipse.emf.cdo.transfer.CDOTransfer;
-import org.eclipse.emf.cdo.transfer.CDOTransferElement;
-import org.eclipse.emf.cdo.transfer.CDOTransferMapping;
-import org.eclipse.emf.cdo.transfer.CDOTransferSystem;
-import org.eclipse.emf.cdo.transfer.spi.repository.RepositoryTransferSystem;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.polarsys.chess.cdo.dialogs.CDOImportDialog;
-import org.polarsys.chess.core.util.CHESSProjectSupport;
-
-public class CDOImportHandler extends AbstractHandler {
-	
-	private String errorMsg = "";
-	
-	@Override
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-
-		IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event);
-
-		if(window != null){
-			Shell shell = window.getShell();
-			
-			//Show a dialog with a list of all the CHESS projects in the configured CDO. 
-			//get the selected CDO project and the entered name for the project (default same name?)
-			//perform the copy from CDO to workspace.
-			CDOImportDialog dialog = null;
-			try{
-				dialog = new CDOImportDialog(shell);
-			}catch (Exception e){
-				MessageDialog.openError(shell, "Import CHESS Project from CDO", "Error: " + e.getMessage());
-			}
-
-			if(dialog != null && dialog.open() == Window.OK){
-				CDOResourceFolder chessProjectCDO = dialog.getSelectedCHESSProjectCDO();
-				String projectName = dialog.getNewProjectName();
-				if(chessProjectCDO != null && projectName != null){
-
-					//create new CHESS project (if not already there)
-					try{
-						IProject chessProject = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-						if(chessProject == null || !chessProject.exists()){
-							IPath workspaceLocation = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-							URI location = URI.create(workspaceLocation + "/" + projectName);
-							chessProject=CHESSProjectSupport.createProject(projectName, null);
-						}else if(!chessProject.isOpen()){
-							chessProject.open(new NullProgressMonitor());
-						}
-
-						CDOTransaction transaction = dialog.getTransaction();
-						
-						String filepath = chessProject.getLocation().toString();
-//						System.out.println(filepath.toString());
-						//ugly workaround to get relative path -- TODO: will it ever work on windows as well?
-						filepath = filepath.substring(System.getProperty("user.home").length()+1);
-//						System.out.println(filepath.toString());
-						
-						CDOTransferSystem source = new RepositoryTransferSystem(transaction);
-						CDOTransferElement target = FileSystemTransferSystem.INSTANCE.getElement(chessProject.getLocation());
-
-						CDOTransfer transfer = new CDOTransfer(source, target.getSystem());
-
-						for(CDOResourceNode node : chessProjectCDO.getNodes()){
-							if(!node.getName().equals(".project")){
-								CDOTransferMapping mapping = transfer.map(node.getPath(), new NullProgressMonitor());
-								mapping.setRelativePath(filepath + File.separator + node.getName());
-								transfer.perform();
-							}
-						}
-						transaction.commit();
-						transaction.close();
-						
-					} catch (Exception e) {
-						e.printStackTrace();
-						errorMsg = e.getMessage();
-					}
-				}
-			}
-			if(errorMsg != null && !errorMsg.isEmpty()){
-				MessageDialog.openError(shell, "Import CHESS Project from CDO", "Error: " + errorMsg);
-				errorMsg = "";
-			}
-		}
-		return null;
-
-	}
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

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

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

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

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

+package org.polarsys.chess.cdo.handlers;

+

+import java.io.File;

+import java.net.URI;

+

+import org.eclipse.core.commands.AbstractHandler;

+import org.eclipse.core.commands.ExecutionEvent;

+import org.eclipse.core.commands.ExecutionException;

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

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

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

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

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

+import org.eclipse.emf.cdo.eresource.CDOResourceFolder;

+import org.eclipse.emf.cdo.eresource.CDOResourceNode;

+import org.eclipse.emf.cdo.spi.transfer.FileSystemTransferSystem;

+import org.eclipse.emf.cdo.transaction.CDOTransaction;

+import org.eclipse.emf.cdo.transfer.CDOTransfer;

+import org.eclipse.emf.cdo.transfer.CDOTransferElement;

+import org.eclipse.emf.cdo.transfer.CDOTransferMapping;

+import org.eclipse.emf.cdo.transfer.CDOTransferSystem;

+import org.eclipse.emf.cdo.transfer.spi.repository.RepositoryTransferSystem;

+import org.eclipse.jface.dialogs.MessageDialog;

+import org.eclipse.jface.window.Window;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.ui.IWorkbenchWindow;

+import org.eclipse.ui.handlers.HandlerUtil;

+import org.polarsys.chess.cdo.dialogs.CDOImportDialog;

+import org.polarsys.chess.core.util.CHESSProjectSupport;

+

+public class CDOImportHandler extends AbstractHandler {

+	

+	private String errorMsg = "";

+	

+	@Override

+	public Object execute(ExecutionEvent event) throws ExecutionException {

+

+		IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event);

+

+		if(window != null){

+			Shell shell = window.getShell();

+			

+			//Show a dialog with a list of all the CHESS projects in the configured CDO. 

+			//get the selected CDO project and the entered name for the project (default same name?)

+			//perform the copy from CDO to workspace.

+			CDOImportDialog dialog = null;

+			try{

+				dialog = new CDOImportDialog(shell);

+			}catch (Exception e){

+				MessageDialog.openError(shell, "Import CHESS Project from CDO", "Error: " + e.getMessage());

+			}

+

+			if(dialog != null && dialog.open() == Window.OK){

+				CDOResourceFolder chessProjectCDO = dialog.getSelectedCHESSProjectCDO();

+				String projectName = dialog.getNewProjectName();

+				if(chessProjectCDO != null && projectName != null){

+

+					//create new CHESS project (if not already there)

+					try{

+						IProject chessProject = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);

+						if(chessProject == null || !chessProject.exists()){

+							IPath workspaceLocation = ResourcesPlugin.getWorkspace().getRoot().getLocation();

+							URI location = URI.create(workspaceLocation + "/" + projectName);

+							chessProject=CHESSProjectSupport.createProject(projectName, null);

+						}else if(!chessProject.isOpen()){

+							chessProject.open(new NullProgressMonitor());

+						}

+

+						CDOTransaction transaction = dialog.getTransaction();

+						

+						String filepath = chessProject.getLocation().toString();

+//						System.out.println(filepath.toString());

+						//ugly workaround to get relative path -- TODO: will it ever work on windows as well?

+						filepath = filepath.substring(System.getProperty("user.home").length()+1);

+//						System.out.println(filepath.toString());

+						

+						CDOTransferSystem source = new RepositoryTransferSystem(transaction);

+						CDOTransferElement target = FileSystemTransferSystem.INSTANCE.getElement(chessProject.getLocation());

+

+						CDOTransfer transfer = new CDOTransfer(source, target.getSystem());

+

+						for(CDOResourceNode node : chessProjectCDO.getNodes()){

+							if(!node.getName().equals(".project")){

+								CDOTransferMapping mapping = transfer.map(node.getPath(), new NullProgressMonitor());

+								mapping.setRelativePath(filepath + File.separator + node.getName());

+								transfer.perform();

+							}

+						}

+						transaction.commit();

+						transaction.close();

+						

+					} catch (Exception e) {

+						e.printStackTrace();

+						errorMsg = e.getMessage();

+					}

+				}

+			}

+			if(errorMsg != null && !errorMsg.isEmpty()){

+				MessageDialog.openError(shell, "Import CHESS Project from CDO", "Error: " + errorMsg);

+				errorMsg = "";

+			}

+		}

+		return null;

+

+	}

+}

diff --git a/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/pages/NewCHESSModelPage.java b/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/pages/NewCHESSModelPage.java
index d285fbe..8caafe5 100644
--- a/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/pages/NewCHESSModelPage.java
+++ b/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/pages/NewCHESSModelPage.java
@@ -1,482 +1,489 @@
-package org.polarsys.chess.cdo.pages;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.cdo.CDOElement;
-import org.eclipse.emf.cdo.eresource.CDOResource;
-import org.eclipse.emf.cdo.eresource.CDOResourceFolder;
-import org.eclipse.emf.cdo.eresource.CDOResourceLeaf;
-import org.eclipse.emf.cdo.eresource.CDOResourceNode;
-import org.eclipse.emf.cdo.explorer.CDOExplorerUtil;
-import org.eclipse.emf.cdo.explorer.checkouts.CDOCheckout;
-import org.eclipse.emf.cdo.explorer.ui.checkouts.CDOCheckoutContentProvider;
-import org.eclipse.emf.cdo.view.CDOView;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.util.ECollections;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.papyrus.uml.diagram.wizards.Activator;
-import org.eclipse.swt.SWT;
-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.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-import com.google.common.base.Strings;
-import com.google.common.eventbus.EventBus;
-
-/**
- * This is the NewCHESSModelPage type. Enjoy.
- */
-public class NewCHESSModelPage extends WizardPage {
-
-	public static final String PAGE_ID = "NewCDOModel"; //$NON-NLS-1$
-
-	private String resourceType = "model";
-
-	private Text folderText;
-
-	private TreeViewer folderViewer;
-
-	private Text nameText;
-
-	private boolean synchronizingFolderSelection;
-
-	private Object selectedElement;
-
-	private boolean selectedElementRevealed;
-
-	private URI newModelResourceURI;
-
-	private String folderRelativePath;
-
-	private String projectName;
-
-	public NewCHESSModelPage(IStructuredSelection selection, EventBus bus, String modelKindName) {
-		super(PAGE_ID);
-
-		setTitle(NLS.bind("New CHESS Model", modelKindName));
-		setDescription(NLS.bind("Create a new CHESS model", modelKindName));
-		setSelection(selection);
-
-		bus.register(this);
-	}
-
-	@Override
-	public void createControl(Composite parentControl) {
-		Composite container = new Composite(parentControl, SWT.NONE);
-		GridDataFactory.fillDefaults().grab(true, true).applyTo(container);
-		container.setLayout(new GridLayout(2, false));
-
-		Label label = new Label(container, SWT.NONE);
-		label.setText("Enter or select the parent folder:");
-		GridDataFactory.swtDefaults().span(2, 1).applyTo(label);
-
-		folderText = new Text(container, SWT.BORDER);
-		GridDataFactory.fillDefaults().grab(true, false).span(2, 1).applyTo(folderText);
-		updateFolderText();
-
-		folderViewer = CDOCheckoutContentProvider.createTreeViewer(container);
-		folderViewer.getTree().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
-		folderViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				if (selectedElementRevealed) {
-					IStructuredSelection selection = (IStructuredSelection) event.getSelection();
-					setSelection(selection);
-				}
-
-				validatePage();
-			}
-		});
-
-		new Label(container, SWT.NONE).setText("Resource name:");
-
-		nameText = new Text(container, SWT.BORDER);
-		GridDataFactory.fillDefaults().grab(true, false).applyTo(nameText);
-		nameText.setText(getUniqueName("di")); //$NON-NLS-1$
-
-		setControl(container);
-
-		folderText.addModifyListener(new ModifyListener() {
-
-			@Override
-			public void modifyText(ModifyEvent e) {
-				// TODO: set parent then revealParent()
-				validatePage();
-			}
-		});
-
-		folderViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection selection = (IStructuredSelection) event.getSelection();
-				setSelection(selection);
-				updateFolderText();
-				validatePage();
-			}
-		});
-
-		nameText.addModifyListener(new ModifyListener() {
-
-			@Override
-			public void modifyText(ModifyEvent e) {
-				validatePage();
-			}
-		});
-
-		parentControl.getShell().getDisplay().asyncExec(new Runnable() {
-			@Override
-			public void run() {
-				revealSelectedElement();
-				validatePage();
-			}
-		});
-	}
-
-	public String getNewResourceName() {
-		return (nameText == null) ? null : nameText.getText().trim();
-	}
-
-	public URI createNewModelResourceURI() {
-		return newModelResourceURI;
-	}
-
-	public URI createSelectedElementURI() {
-		if (selectedElement instanceof CDOCheckout) {
-			CDOCheckout checkout = (CDOCheckout) selectedElement;
-			return checkout.getURI();
-		}
-
-		if (selectedElement instanceof CDOResourceNode) {
-			CDOResourceNode resourceNode = (CDOResourceNode) selectedElement;
-			return resourceNode.getURI();
-		}
-
-		return null;
-	}
-
-	/**
-	 * Diagram extension changed.
-	 *
-	 * @param newExtension
-	 *            the new extension
-	 * @return result of validation of the new extension
-	 */
-	public IStatus diagramExtensionChanged(String newExtension) {
-		String currentExtension = getExtension();
-		if (!newExtension.equals(currentExtension)) {
-
-			String oldFileName = getNewResourceName();
-			String base = oldFileName;
-			if (currentExtension != null) {
-				// take one off for the '.'
-				base = base.substring(0, base.length() - currentExtension.length() - 1);
-			}
-			String newFileName = getUniqueName(newExtension);
-
-			setNewResourceName(newFileName);
-
-			String message1 = org.eclipse.papyrus.uml.diagram.wizards.Messages.NewModelFilePage_new_diagram_category_needs_specific_extension;
-			String message2 = NLS.bind(org.eclipse.papyrus.uml.diagram.wizards.Messages.NewModelFilePage_diagram_file_was_renamed, oldFileName, newFileName);
-			String message = message1 + message2;
-			Status resultStatus = new Status(IStatus.INFO, Activator.PLUGIN_ID, message);
-
-			String errorMessage = getErrorMessage();
-			if (errorMessage != null) {
-				resultStatus = new Status(IStatus.ERROR, Activator.PLUGIN_ID, errorMessage);
-			}
-			return resultStatus;
-		}
-		return Status.OK_STATUS;
-	}
-
-	protected void setNewResourceName(String newName) {
-		nameText.setText(newName.trim());
-	}
-
-	protected void validatePage() {
-		newModelResourceURI = null;
-		setMessage(null, NONE);
-		setPageComplete(true);
-
-		String folder = folderText.getText().trim();
-		if (Strings.isNullOrEmpty(folder)) {
-			setPageComplete(false);
-			return;
-		}
-
-		String[] segments = getSegments(folder);
-		CDOCheckout checkout = CDOExplorerUtil.getCheckoutManager().getCheckoutByLabel(segments[0]);
-		if (checkout == null) {
-			setMessage(NLS.bind("The selected checkout does not exist.", segments[0]), ERROR);
-			setPageComplete(false);
-			return;
-		}
-
-		CDOView view = checkout.getView();
-		String path = "";
-		SegmentType segmentType = SegmentType.FOLDER; // The checkout is treated like a folder.
-
-		for (int i = 1; i < segments.length; i++) {
-			String segment = segments[i];
-			path += "/";
-			path += segment;
-
-			segmentType = SegmentType.of(view, path);
-			if (segmentType == SegmentType.OTHER) {
-				setMessage("The specified folder cannot be created.", ERROR);
-				setPageComplete(false);
-				return;
-			}
-		}
-
-		String name = getNewResourceName();
-		if (Strings.isNullOrEmpty(name)) {
-			setMessage("The new model resource name is required.", ERROR);
-			setPageComplete(false);
-			return;
-		}
-		
-		if (segmentType != SegmentType.MISSING) {
-			String fullPath = path + "/" + name;
-			if (SegmentType.of(view, fullPath) != SegmentType.MISSING) {
-				setMessage(NLS.bind("The resource already exists.", fullPath), ERROR);
-				setPageComplete(false);
-				return;
-			}
-		}
-		//TODO work in progress!!
-		String folderName = name.substring(0, name.lastIndexOf("."));
-		path = path.concat("/" + folderName.substring(0, 1).toUpperCase() + folderName.substring(1)); 
-		
-		newModelResourceURI = checkout.createResourceURI(path).appendSegment(name);
-		folderRelativePath = path;
-		projectName = folderName;
-
-		if (segmentType == SegmentType.MISSING) {
-			setMessage("The specified folder does not exist and will be created.", WARNING);
-		}
-	}
-
-	private String[] getSegments(String folder) {
-		while (folder.startsWith("/")) {
-			folder = folder.substring(1);
-		}
-
-		while (folder.endsWith("/")) {
-			folder = folder.substring(0, folder.length() - 1);
-		}
-
-		return folder.split("/");
-	}
-
-	private String getExtension() {
-		String result = null;
-		String name = getNewResourceName();
-
-		if (name != null) {
-			// the proper extension is whatever follows the *last* '.',
-			// but for our purposes we need e.g. "profile.uml" to be
-			// an extension
-			int dot = name.indexOf('.');
-			if (dot >= 0) {
-				result = name.substring(dot + 1);
-			}
-		}
-
-		return result;
-	}
-
-	private void setSelection(IStructuredSelection selection) {
-		selectedElement = null;
-
-		if (!selection.isEmpty()) {
-			Object element = selection.getFirstElement();
-			if (element instanceof CDOElement) {
-				element = ((CDOElement) element).getDelegate();
-			}
-
-			if (element instanceof CDOCheckout) {
-				selectedElement = element;
-			} else if (element instanceof CDOResourceLeaf) {
-				selectedElement = ((CDOResourceLeaf) element).getFolder();
-			} else if (element instanceof CDOResourceFolder) {
-				selectedElement = (CDOResourceFolder) element;
-			} else if (element instanceof EObject) {
-				Resource resource = ((EObject) element).eResource();
-				if (resource instanceof CDOResource) {
-					selectedElement = ((CDOResource) resource).getFolder();
-				}
-			}
-		}
-	}
-
-	private void updateFolderText() {
-		if (!synchronizingFolderSelection) {
-			synchronizingFolderSelection = true;
-
-			try {
-				if (selectedElement == null) {
-					folderText.setText(""); //$NON-NLS-1$
-				} else {
-					StringBuilder builder = new StringBuilder();
-					for (Object node : getSelectedSegments()) {
-						builder.append('/');
-						builder.append(CDOExplorerUtil.getName(node));
-					}
-
-					String path = builder.toString();
-					folderText.setText(path);
-				}
-			} finally {
-				synchronizingFolderSelection = false;
-			}
-		}
-	}
-
-	private void revealSelectedElement() {
-		if (selectedElement != null) {
-			List<Object> segments = getSelectedSegments();
-			for (int i = 0; i < segments.size() - 1; i++) {
-				Object segment = segments.get(i);
-				folderViewer.setExpandedState(segment, true);
-			}
-
-			selectedElementRevealed = true;
-			folderViewer.setSelection(new StructuredSelection(selectedElement), true);
-		}
-	}
-
-	private List<Object> getSelectedSegments() {
-		List<Object> segments = new ArrayList<Object>();
-		fillSegments(segments, selectedElement);
-		return segments;
-	}
-
-	private void fillSegments(List<Object> segments, Object element) {
-		if (element instanceof CDOCheckout) {
-			segments.add(element);
-			return;
-		}
-
-		if (element instanceof CDOResourceFolder) {
-			CDOResourceFolder folder = (CDOResourceFolder) element;
-
-			Adapter adapter = EcoreUtil.getAdapter(folder.eAdapters(), CDOCheckout.class);
-			if (adapter != null) {
-				fillSegments(segments, adapter);
-			} else {
-				Object parent = folder.getFolder();
-				if (parent == null) {
-					parent = EcoreUtil.getAdapter(folder.cdoView().getRootResource().eAdapters(), CDOCheckout.class);
-				}
-
-				fillSegments(segments, parent);
-			}
-		}
-
-		segments.add(element);
-	}
-
-	private EList<EObject> getChildrenOfSelectedElement() {
-		if (selectedElement instanceof CDOCheckout) {
-			CDOCheckout checkout = (CDOCheckout) selectedElement;
-			return checkout.getRootObject().eContents();
-		}
-
-		if (selectedElement instanceof CDOResourceFolder) {
-			CDOResourceFolder folder = (CDOResourceFolder) selectedElement;
-			return folder.eContents();
-		}
-
-		return ECollections.emptyEList();
-	}
-
-	private String getUniqueName(String extension) {
-		Set<String> names = new HashSet<String>();
-		for (EObject eObject : getChildrenOfSelectedElement()) {
-			if (eObject instanceof CDOResourceNode) {
-				CDOResourceNode node = (CDOResourceNode) eObject;
-				String name = node.getName();
-				if (name.startsWith(resourceType)) {
-					names.add(name);
-				}
-			}
-		}
-
-		for (int i = 1; i < Integer.MAX_VALUE; i++) {
-			String name = resourceType + (i > 1 ? i : "") + "." + extension;
-			if (!names.contains(name)) {
-				return name;
-			}
-		}
-
-		throw new IllegalStateException("Too many children");
-	}
-
-	/**
-	 * @author Stepper
-	 */
-	private enum SegmentType {
-		MISSING, FOLDER, OTHER;
-
-		public static SegmentType of(CDOView view, String path) {
-			CDOResourceNode resourceNode;
-			try {
-				resourceNode = view.getResourceNode(path);
-				if (resourceNode != null) {
-					if (resourceNode instanceof CDOResourceFolder) {
-						return SegmentType.FOLDER;
-					}
-
-					return SegmentType.OTHER;
-				}
-			} catch (Exception ex) {
-				//$FALL-THROUGH$
-			}
-
-			return SegmentType.MISSING;
-		}
-
-		private static SegmentType of(CDOResourceNode resourceNode) {
-			if (resourceNode == null) {
-				return SegmentType.MISSING;
-			}
-
-			if (resourceNode instanceof CDOResourceFolder) {
-				return SegmentType.FOLDER;
-			}
-
-			return SegmentType.OTHER;
-		}
-	}
-
-	public String getFolderRelativePath() {
-		return folderRelativePath;
-	}
-	
-	public String getProjectName() {
-		return projectName;
-	}
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

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

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

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

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

+package org.polarsys.chess.cdo.pages;

+

+import java.util.ArrayList;

+import java.util.HashSet;

+import java.util.List;

+import java.util.Set;

+

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

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

+import org.eclipse.emf.cdo.CDOElement;

+import org.eclipse.emf.cdo.eresource.CDOResource;

+import org.eclipse.emf.cdo.eresource.CDOResourceFolder;

+import org.eclipse.emf.cdo.eresource.CDOResourceLeaf;

+import org.eclipse.emf.cdo.eresource.CDOResourceNode;

+import org.eclipse.emf.cdo.explorer.CDOExplorerUtil;

+import org.eclipse.emf.cdo.explorer.checkouts.CDOCheckout;

+import org.eclipse.emf.cdo.explorer.ui.checkouts.CDOCheckoutContentProvider;

+import org.eclipse.emf.cdo.view.CDOView;

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

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

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

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

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

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

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

+import org.eclipse.jface.layout.GridDataFactory;

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

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

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

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

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

+import org.eclipse.jface.wizard.WizardPage;

+import org.eclipse.osgi.util.NLS;

+import org.eclipse.papyrus.uml.diagram.wizards.Activator;

+import org.eclipse.swt.SWT;

+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.Composite;

+import org.eclipse.swt.widgets.Label;

+import org.eclipse.swt.widgets.Text;

+

+import com.google.common.base.Strings;

+import com.google.common.eventbus.EventBus;

+

+/**

+ * This is the NewCHESSModelPage type. Enjoy.

+ */

+public class NewCHESSModelPage extends WizardPage {

+

+	public static final String PAGE_ID = "NewCDOModel"; //$NON-NLS-1$

+

+	private String resourceType = "model";

+

+	private Text folderText;

+

+	private TreeViewer folderViewer;

+

+	private Text nameText;

+

+	private boolean synchronizingFolderSelection;

+

+	private Object selectedElement;

+

+	private boolean selectedElementRevealed;

+

+	private URI newModelResourceURI;

+

+	private String folderRelativePath;

+

+	private String projectName;

+

+	public NewCHESSModelPage(IStructuredSelection selection, EventBus bus, String modelKindName) {

+		super(PAGE_ID);

+

+		setTitle(NLS.bind("New CHESS Model", modelKindName));

+		setDescription(NLS.bind("Create a new CHESS model", modelKindName));

+		setSelection(selection);

+

+		bus.register(this);

+	}

+

+	@Override

+	public void createControl(Composite parentControl) {

+		Composite container = new Composite(parentControl, SWT.NONE);

+		GridDataFactory.fillDefaults().grab(true, true).applyTo(container);

+		container.setLayout(new GridLayout(2, false));

+

+		Label label = new Label(container, SWT.NONE);

+		label.setText("Enter or select the parent folder:");

+		GridDataFactory.swtDefaults().span(2, 1).applyTo(label);

+

+		folderText = new Text(container, SWT.BORDER);

+		GridDataFactory.fillDefaults().grab(true, false).span(2, 1).applyTo(folderText);

+		updateFolderText();

+

+		folderViewer = CDOCheckoutContentProvider.createTreeViewer(container);

+		folderViewer.getTree().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));

+		folderViewer.addSelectionChangedListener(new ISelectionChangedListener() {

+			@Override

+			public void selectionChanged(SelectionChangedEvent event) {

+				if (selectedElementRevealed) {

+					IStructuredSelection selection = (IStructuredSelection) event.getSelection();

+					setSelection(selection);

+				}

+

+				validatePage();

+			}

+		});

+

+		new Label(container, SWT.NONE).setText("Resource name:");

+

+		nameText = new Text(container, SWT.BORDER);

+		GridDataFactory.fillDefaults().grab(true, false).applyTo(nameText);

+		nameText.setText(getUniqueName("di")); //$NON-NLS-1$

+

+		setControl(container);

+

+		folderText.addModifyListener(new ModifyListener() {

+

+			@Override

+			public void modifyText(ModifyEvent e) {

+				// TODO: set parent then revealParent()

+				validatePage();

+			}

+		});

+

+		folderViewer.addSelectionChangedListener(new ISelectionChangedListener() {

+

+			@Override

+			public void selectionChanged(SelectionChangedEvent event) {

+				IStructuredSelection selection = (IStructuredSelection) event.getSelection();

+				setSelection(selection);

+				updateFolderText();

+				validatePage();

+			}

+		});

+

+		nameText.addModifyListener(new ModifyListener() {

+

+			@Override

+			public void modifyText(ModifyEvent e) {

+				validatePage();

+			}

+		});

+

+		parentControl.getShell().getDisplay().asyncExec(new Runnable() {

+			@Override

+			public void run() {

+				revealSelectedElement();

+				validatePage();

+			}

+		});

+	}

+

+	public String getNewResourceName() {

+		return (nameText == null) ? null : nameText.getText().trim();

+	}

+

+	public URI createNewModelResourceURI() {

+		return newModelResourceURI;

+	}

+

+	public URI createSelectedElementURI() {

+		if (selectedElement instanceof CDOCheckout) {

+			CDOCheckout checkout = (CDOCheckout) selectedElement;

+			return checkout.getURI();

+		}

+

+		if (selectedElement instanceof CDOResourceNode) {

+			CDOResourceNode resourceNode = (CDOResourceNode) selectedElement;

+			return resourceNode.getURI();

+		}

+

+		return null;

+	}

+

+	/**

+	 * Diagram extension changed.

+	 *

+	 * @param newExtension

+	 *            the new extension

+	 * @return result of validation of the new extension

+	 */

+	public IStatus diagramExtensionChanged(String newExtension) {

+		String currentExtension = getExtension();

+		if (!newExtension.equals(currentExtension)) {

+

+			String oldFileName = getNewResourceName();

+			String base = oldFileName;

+			if (currentExtension != null) {

+				// take one off for the '.'

+				base = base.substring(0, base.length() - currentExtension.length() - 1);

+			}

+			String newFileName = getUniqueName(newExtension);

+

+			setNewResourceName(newFileName);

+

+			String message1 = org.eclipse.papyrus.uml.diagram.wizards.Messages.NewModelFilePage_new_diagram_category_needs_specific_extension;

+			String message2 = NLS.bind(org.eclipse.papyrus.uml.diagram.wizards.Messages.NewModelFilePage_diagram_file_was_renamed, oldFileName, newFileName);

+			String message = message1 + message2;

+			Status resultStatus = new Status(IStatus.INFO, Activator.PLUGIN_ID, message);

+

+			String errorMessage = getErrorMessage();

+			if (errorMessage != null) {

+				resultStatus = new Status(IStatus.ERROR, Activator.PLUGIN_ID, errorMessage);

+			}

+			return resultStatus;

+		}

+		return Status.OK_STATUS;

+	}

+

+	protected void setNewResourceName(String newName) {

+		nameText.setText(newName.trim());

+	}

+

+	protected void validatePage() {

+		newModelResourceURI = null;

+		setMessage(null, NONE);

+		setPageComplete(true);

+

+		String folder = folderText.getText().trim();

+		if (Strings.isNullOrEmpty(folder)) {

+			setPageComplete(false);

+			return;

+		}

+

+		String[] segments = getSegments(folder);

+		CDOCheckout checkout = CDOExplorerUtil.getCheckoutManager().getCheckoutByLabel(segments[0]);

+		if (checkout == null) {

+			setMessage(NLS.bind("The selected checkout does not exist.", segments[0]), ERROR);

+			setPageComplete(false);

+			return;

+		}

+

+		CDOView view = checkout.getView();

+		String path = "";

+		SegmentType segmentType = SegmentType.FOLDER; // The checkout is treated like a folder.

+

+		for (int i = 1; i < segments.length; i++) {

+			String segment = segments[i];

+			path += "/";

+			path += segment;

+

+			segmentType = SegmentType.of(view, path);

+			if (segmentType == SegmentType.OTHER) {

+				setMessage("The specified folder cannot be created.", ERROR);

+				setPageComplete(false);

+				return;

+			}

+		}

+

+		String name = getNewResourceName();

+		if (Strings.isNullOrEmpty(name)) {

+			setMessage("The new model resource name is required.", ERROR);

+			setPageComplete(false);

+			return;

+		}

+		

+		if (segmentType != SegmentType.MISSING) {

+			String fullPath = path + "/" + name;

+			if (SegmentType.of(view, fullPath) != SegmentType.MISSING) {

+				setMessage(NLS.bind("The resource already exists.", fullPath), ERROR);

+				setPageComplete(false);

+				return;

+			}

+		}

+		//TODO work in progress!!

+		String folderName = name.substring(0, name.lastIndexOf("."));

+		path = path.concat("/" + folderName.substring(0, 1).toUpperCase() + folderName.substring(1)); 

+		

+		newModelResourceURI = checkout.createResourceURI(path).appendSegment(name);

+		folderRelativePath = path;

+		projectName = folderName;

+

+		if (segmentType == SegmentType.MISSING) {

+			setMessage("The specified folder does not exist and will be created.", WARNING);

+		}

+	}

+

+	private String[] getSegments(String folder) {

+		while (folder.startsWith("/")) {

+			folder = folder.substring(1);

+		}

+

+		while (folder.endsWith("/")) {

+			folder = folder.substring(0, folder.length() - 1);

+		}

+

+		return folder.split("/");

+	}

+

+	private String getExtension() {

+		String result = null;

+		String name = getNewResourceName();

+

+		if (name != null) {

+			// the proper extension is whatever follows the *last* '.',

+			// but for our purposes we need e.g. "profile.uml" to be

+			// an extension

+			int dot = name.indexOf('.');

+			if (dot >= 0) {

+				result = name.substring(dot + 1);

+			}

+		}

+

+		return result;

+	}

+

+	private void setSelection(IStructuredSelection selection) {

+		selectedElement = null;

+

+		if (!selection.isEmpty()) {

+			Object element = selection.getFirstElement();

+			if (element instanceof CDOElement) {

+				element = ((CDOElement) element).getDelegate();

+			}

+

+			if (element instanceof CDOCheckout) {

+				selectedElement = element;

+			} else if (element instanceof CDOResourceLeaf) {

+				selectedElement = ((CDOResourceLeaf) element).getFolder();

+			} else if (element instanceof CDOResourceFolder) {

+				selectedElement = (CDOResourceFolder) element;

+			} else if (element instanceof EObject) {

+				Resource resource = ((EObject) element).eResource();

+				if (resource instanceof CDOResource) {

+					selectedElement = ((CDOResource) resource).getFolder();

+				}

+			}

+		}

+	}

+

+	private void updateFolderText() {

+		if (!synchronizingFolderSelection) {

+			synchronizingFolderSelection = true;

+

+			try {

+				if (selectedElement == null) {

+					folderText.setText(""); //$NON-NLS-1$

+				} else {

+					StringBuilder builder = new StringBuilder();

+					for (Object node : getSelectedSegments()) {

+						builder.append('/');

+						builder.append(CDOExplorerUtil.getName(node));

+					}

+

+					String path = builder.toString();

+					folderText.setText(path);

+				}

+			} finally {

+				synchronizingFolderSelection = false;

+			}

+		}

+	}

+

+	private void revealSelectedElement() {

+		if (selectedElement != null) {

+			List<Object> segments = getSelectedSegments();

+			for (int i = 0; i < segments.size() - 1; i++) {

+				Object segment = segments.get(i);

+				folderViewer.setExpandedState(segment, true);

+			}

+

+			selectedElementRevealed = true;

+			folderViewer.setSelection(new StructuredSelection(selectedElement), true);

+		}

+	}

+

+	private List<Object> getSelectedSegments() {

+		List<Object> segments = new ArrayList<Object>();

+		fillSegments(segments, selectedElement);

+		return segments;

+	}

+

+	private void fillSegments(List<Object> segments, Object element) {

+		if (element instanceof CDOCheckout) {

+			segments.add(element);

+			return;

+		}

+

+		if (element instanceof CDOResourceFolder) {

+			CDOResourceFolder folder = (CDOResourceFolder) element;

+

+			Adapter adapter = EcoreUtil.getAdapter(folder.eAdapters(), CDOCheckout.class);

+			if (adapter != null) {

+				fillSegments(segments, adapter);

+			} else {

+				Object parent = folder.getFolder();

+				if (parent == null) {

+					parent = EcoreUtil.getAdapter(folder.cdoView().getRootResource().eAdapters(), CDOCheckout.class);

+				}

+

+				fillSegments(segments, parent);

+			}

+		}

+

+		segments.add(element);

+	}

+

+	private EList<EObject> getChildrenOfSelectedElement() {

+		if (selectedElement instanceof CDOCheckout) {

+			CDOCheckout checkout = (CDOCheckout) selectedElement;

+			return checkout.getRootObject().eContents();

+		}

+

+		if (selectedElement instanceof CDOResourceFolder) {

+			CDOResourceFolder folder = (CDOResourceFolder) selectedElement;

+			return folder.eContents();

+		}

+

+		return ECollections.emptyEList();

+	}

+

+	private String getUniqueName(String extension) {

+		Set<String> names = new HashSet<String>();

+		for (EObject eObject : getChildrenOfSelectedElement()) {

+			if (eObject instanceof CDOResourceNode) {

+				CDOResourceNode node = (CDOResourceNode) eObject;

+				String name = node.getName();

+				if (name.startsWith(resourceType)) {

+					names.add(name);

+				}

+			}

+		}

+

+		for (int i = 1; i < Integer.MAX_VALUE; i++) {

+			String name = resourceType + (i > 1 ? i : "") + "." + extension;

+			if (!names.contains(name)) {

+				return name;

+			}

+		}

+

+		throw new IllegalStateException("Too many children");

+	}

+

+	/**

+	 * @author Stepper

+	 */

+	private enum SegmentType {

+		MISSING, FOLDER, OTHER;

+

+		public static SegmentType of(CDOView view, String path) {

+			CDOResourceNode resourceNode;

+			try {

+				resourceNode = view.getResourceNode(path);

+				if (resourceNode != null) {

+					if (resourceNode instanceof CDOResourceFolder) {

+						return SegmentType.FOLDER;

+					}

+

+					return SegmentType.OTHER;

+				}

+			} catch (Exception ex) {

+				//$FALL-THROUGH$

+			}

+

+			return SegmentType.MISSING;

+		}

+

+		private static SegmentType of(CDOResourceNode resourceNode) {

+			if (resourceNode == null) {

+				return SegmentType.MISSING;

+			}

+

+			if (resourceNode instanceof CDOResourceFolder) {

+				return SegmentType.FOLDER;

+			}

+

+			return SegmentType.OTHER;

+		}

+	}

+

+	public String getFolderRelativePath() {

+		return folderRelativePath;

+	}

+	

+	public String getProjectName() {

+		return projectName;

+	}

+}

diff --git a/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/providers/CHESSCDONewModelStorageProvider.java b/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/providers/CHESSCDONewModelStorageProvider.java
index ab5d70e..981b770 100644
--- a/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/providers/CHESSCDONewModelStorageProvider.java
+++ b/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/providers/CHESSCDONewModelStorageProvider.java
@@ -1,254 +1,261 @@
-package org.polarsys.chess.cdo.providers;
-
-import static org.eclipse.papyrus.uml.diagram.wizards.utils.WizardsHelper.adapt;
-import static org.eclipse.papyrus.uml.diagram.wizards.utils.WizardsHelper.getSelectedResourceURI;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.cdo.CDOObject;
-import org.eclipse.emf.cdo.eresource.CDOResourceNode;
-import org.eclipse.emf.cdo.explorer.CDOExplorerUtil;
-import org.eclipse.emf.cdo.explorer.checkouts.CDOCheckout;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.papyrus.cdo.internal.core.CDOUtils;
-import org.eclipse.papyrus.cdo.internal.ui.editors.PapyrusCDOEditorInput;
-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage;
-import org.eclipse.papyrus.uml.diagram.wizards.providers.AbstractNewModelStorageProvider;
-import org.eclipse.papyrus.uml.diagram.wizards.wizards.CreateModelWizard;
-import org.eclipse.papyrus.uml.diagram.wizards.wizards.InitModelWizard;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.INewWizard;
-import org.polarsys.chess.cdo.pages.NewCHESSModelPage;
-import org.polarsys.chess.cdo.wizards.CreateCDOCHESSModelWizard;
-import org.polarsys.chess.wizards.wizards.CreateCHESSModelWizard;
-
-import com.google.common.eventbus.EventBus;
-
-
-public class CHESSCDONewModelStorageProvider extends AbstractNewModelStorageProvider {
-
-	private final EventBus bus = new EventBus("NewCDOModelWizard"); //$NON-NLS-1$
-
-	private CreateCDOCHESSModelWizard wizard;
-
-	private SelectDiagramCategoryPage newDiagramCategoryPage;
-
-	private NewCHESSModelPage newModelPage;
-
-	private IStructuredSelection selection;
-
-	public CHESSCDONewModelStorageProvider() {
-		super();
-	}
-
-	@Override
-	public boolean canHandle(IStructuredSelection initialSelection) {
-		for (Object next : initialSelection.toList()) {
-			if (CDOUtils.isCDOObject(adapt(next, EObject.class))) {
-				return true;
-			}
-
-			if (adapt(next, CDOCheckout.class) != null) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	public void init(CreateCDOCHESSModelWizard wizard, IStructuredSelection selection) {
-//		super.init(wizard, selection);
-
-		this.wizard = wizard;
-		this.selection = selection;
-		newModelPage = createNewModelPage(selection);
-		createSelectProviderPart();
-
-		CDOCheckout checkout = getRepository(selection);
-		if (checkout != null) {
-			bus.post(checkout);
-		}
-
-//		newDiagramCategoryPage = createNewDiagramCategoryPage(selection);
-	}
-
-	/**
-	 * Gets the contextual repository, if any, from a selection.
-	 *
-	 * @param selection
-	 *            a selection
-	 *
-	 * @return the repository that is or contains the {@code selection}
-	 */
-	static CDOCheckout getRepository(IStructuredSelection selection) {
-		CDOCheckout result = null;
-
-		if (!selection.isEmpty()) {
-			result = adapt(selection.getFirstElement(), CDOCheckout.class);
-			if (result == null) {
-				CDOResourceNode node = adapt(selection.getFirstElement(), CDOResourceNode.class);
-				if (node == null) {
-					EObject object = adapt(selection.getFirstElement(), EObject.class);
-					if (object != null) {
-						CDOObject cdo = CDOUtils.getCDOObject(object);
-						if (cdo != null) {
-							node = cdo.cdoResource();
-						}
-					}
-				}
-
-				if (node != null) {
-					result = CDOExplorerUtil.getCheckout(node.getURI());
-				}
-			}
-		}
-
-		return result;
-	}
-
-	@Override
-	public List<? extends IWizardPage> createPages() {
-		if (newModelPage == null && newDiagramCategoryPage == null) {
-			return Collections.emptyList();
-		}
-
-		return Arrays.asList(newDiagramCategoryPage, newModelPage);
-	}
-
-	@Override
-	public SelectDiagramCategoryPage getDiagramCategoryPage() {
-		return newDiagramCategoryPage;
-	}
-
-	@Override
-	public IStatus validateDiagramCategories(String... newCategories) {
-		if (newModelPage != null && newModelPage.getNewResourceName() != null) {
-			String firstCategory = newCategories.length > 0 ? newCategories[0] : null;
-			if (newCategories.length > 0) {
-				// 316943 - [Wizard] Wrong suffix for file name when creating a
-				// profile model
-				return newModelPage.diagramExtensionChanged(wizard.getDiagramFileExtension(firstCategory));
-			}
-		}
-
-		return super.validateDiagramCategories(newCategories);
-	}
-
-	/**
-	 * Creates the new model page, if required.
-	 *
-	 * @param selection
-	 *            the selection
-	 *
-	 * @return the new model page, or {@code null} if none
-	 */
-	protected NewCHESSModelPage createNewModelPage(IStructuredSelection selection) {
-		if (wizard.isCreateProjectWizard() || wizard.isCreateMultipleModelsWizard()) {
-
-			return null;
-		}
-
-		if (isCreateFromExistingDomainModel()) {
-			URI uri = getSelectedResourceURI(selection);
-			if (uri != null) {
-				uri = uri.trimFileExtension().appendFileExtension(wizard.getDiagramFileExtension(null));
-				return new NewDiagramForExistingModelPage(selection, wizard.getModelKindName(), bus, uri.lastSegment());
-			}
-		}
-
-		return new NewCHESSModelPage(selection, bus, wizard.getModelKindName());
-	}
-
-	protected boolean isCreateFromExistingDomainModel() {
-		return false;
-	}
-
-	@Override
-	public URI createNewModelURI(String categoryId) {
-		return newModelPage.createNewModelResourceURI();
-	}
-
-	@Override
-	public IEditorInput createEditorInput(URI uri) {
-		return new PapyrusCDOEditorInput(uri, uri.trimFileExtension().lastSegment());
-	}
-
-//	private SelectDiagramCategoryPage createNewDiagramCategoryPage(IStructuredSelection selection) {
-//		if (wizard.isCreateProjectWizard() || wizard.isCreateMultipleModelsWizard() || !wizard.isPapyrusRootWizard()) {
-//			return null;
-//		}
-//
-//		return new SelectDiagramCategoryPage();
-//	}
-
-
-	//
-	// Nested types
-	//
-
-	/**
-	 * This is the NewDiagramForExistingModelPage type. Enjoy.
-	 */
-	protected static class NewDiagramForExistingModelPage extends NewCHESSModelPage {
-
-		/** The my diagram resource name. */
-		private final String myDiagramResourceName;
-
-		/**
-		 * Instantiates a new new diagram for existing model page.
-		 *
-		 * @param selection
-		 *            the selection
-		 * @param modelKindName
-		 *            the user-presentable (translatable) name of the kind of
-		 *            model to create
-		 * @param bus
-		 *            an event bus for posting events
-		 * @param defaultResourceName
-		 *            the default resource name
-		 */
-		public NewDiagramForExistingModelPage(IStructuredSelection selection, String modelKindName, EventBus bus, String defaultResourceName) {
-
-			super(selection, bus, modelKindName);
-
-			myDiagramResourceName = defaultResourceName;
-			setTitle("Init a new Papyrus model");
-			setDescription("Init a new Papyrus model from the existing domain model");
-		}
-
-		@Override
-		public void createControl(Composite parent) {
-			super.createControl(parent);
-
-			setNewResourceName(myDiagramResourceName);
-		}
-
-		@Override
-		protected void validatePage() {
-			super.validatePage();
-
-			if (getMessageType() < ERROR) {
-				if (!myDiagramResourceName.equals(getNewResourceName())) {
-					setMessage(NLS.bind(org.eclipse.papyrus.uml.diagram.wizards.Messages.InitModelWizard_diagram_name_is_different_from_domain_model, myDiagramResourceName), ERROR);
-					setPageComplete(false);
-				}
-			}
-		};
-	}
-	
-	public String getFolderRelativePath(){
-		return newModelPage.getFolderRelativePath();		
-	}
-	
-	public String getProjectName(){
-		return newModelPage.getProjectName();		
-	}
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

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

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

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

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

+package org.polarsys.chess.cdo.providers;

+

+import static org.eclipse.papyrus.uml.diagram.wizards.utils.WizardsHelper.adapt;

+import static org.eclipse.papyrus.uml.diagram.wizards.utils.WizardsHelper.getSelectedResourceURI;

+

+import java.util.Arrays;

+import java.util.Collections;

+import java.util.List;

+

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

+import org.eclipse.emf.cdo.CDOObject;

+import org.eclipse.emf.cdo.eresource.CDOResourceNode;

+import org.eclipse.emf.cdo.explorer.CDOExplorerUtil;

+import org.eclipse.emf.cdo.explorer.checkouts.CDOCheckout;

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

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

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

+import org.eclipse.jface.wizard.IWizardPage;

+import org.eclipse.osgi.util.NLS;

+import org.eclipse.papyrus.cdo.internal.core.CDOUtils;

+import org.eclipse.papyrus.cdo.internal.ui.editors.PapyrusCDOEditorInput;

+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage;

+import org.eclipse.papyrus.uml.diagram.wizards.providers.AbstractNewModelStorageProvider;

+import org.eclipse.papyrus.uml.diagram.wizards.wizards.CreateModelWizard;

+import org.eclipse.papyrus.uml.diagram.wizards.wizards.InitModelWizard;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.ui.IEditorInput;

+import org.eclipse.ui.INewWizard;

+import org.polarsys.chess.cdo.pages.NewCHESSModelPage;

+import org.polarsys.chess.cdo.wizards.CreateCDOCHESSModelWizard;

+import org.polarsys.chess.wizards.wizards.CreateCHESSModelWizard;

+

+import com.google.common.eventbus.EventBus;

+

+

+public class CHESSCDONewModelStorageProvider extends AbstractNewModelStorageProvider {

+

+	private final EventBus bus = new EventBus("NewCDOModelWizard"); //$NON-NLS-1$

+

+	private CreateCDOCHESSModelWizard wizard;

+

+	private SelectDiagramCategoryPage newDiagramCategoryPage;

+

+	private NewCHESSModelPage newModelPage;

+

+	private IStructuredSelection selection;

+

+	public CHESSCDONewModelStorageProvider() {

+		super();

+	}

+

+	@Override

+	public boolean canHandle(IStructuredSelection initialSelection) {

+		for (Object next : initialSelection.toList()) {

+			if (CDOUtils.isCDOObject(adapt(next, EObject.class))) {

+				return true;

+			}

+

+			if (adapt(next, CDOCheckout.class) != null) {

+				return true;

+			}

+		}

+

+		return false;

+	}

+

+	public void init(CreateCDOCHESSModelWizard wizard, IStructuredSelection selection) {

+//		super.init(wizard, selection);

+

+		this.wizard = wizard;

+		this.selection = selection;

+		newModelPage = createNewModelPage(selection);

+		createSelectProviderPart();

+

+		CDOCheckout checkout = getRepository(selection);

+		if (checkout != null) {

+			bus.post(checkout);

+		}

+

+//		newDiagramCategoryPage = createNewDiagramCategoryPage(selection);

+	}

+

+	/**

+	 * Gets the contextual repository, if any, from a selection.

+	 *

+	 * @param selection

+	 *            a selection

+	 *

+	 * @return the repository that is or contains the {@code selection}

+	 */

+	static CDOCheckout getRepository(IStructuredSelection selection) {

+		CDOCheckout result = null;

+

+		if (!selection.isEmpty()) {

+			result = adapt(selection.getFirstElement(), CDOCheckout.class);

+			if (result == null) {

+				CDOResourceNode node = adapt(selection.getFirstElement(), CDOResourceNode.class);

+				if (node == null) {

+					EObject object = adapt(selection.getFirstElement(), EObject.class);

+					if (object != null) {

+						CDOObject cdo = CDOUtils.getCDOObject(object);

+						if (cdo != null) {

+							node = cdo.cdoResource();

+						}

+					}

+				}

+

+				if (node != null) {

+					result = CDOExplorerUtil.getCheckout(node.getURI());

+				}

+			}

+		}

+

+		return result;

+	}

+

+	@Override

+	public List<? extends IWizardPage> createPages() {

+		if (newModelPage == null && newDiagramCategoryPage == null) {

+			return Collections.emptyList();

+		}

+

+		return Arrays.asList(newDiagramCategoryPage, newModelPage);

+	}

+

+	@Override

+	public SelectDiagramCategoryPage getDiagramCategoryPage() {

+		return newDiagramCategoryPage;

+	}

+

+	@Override

+	public IStatus validateDiagramCategories(String... newCategories) {

+		if (newModelPage != null && newModelPage.getNewResourceName() != null) {

+			String firstCategory = newCategories.length > 0 ? newCategories[0] : null;

+			if (newCategories.length > 0) {

+				// 316943 - [Wizard] Wrong suffix for file name when creating a

+				// profile model

+				return newModelPage.diagramExtensionChanged(wizard.getDiagramFileExtension(firstCategory));

+			}

+		}

+

+		return super.validateDiagramCategories(newCategories);

+	}

+

+	/**

+	 * Creates the new model page, if required.

+	 *

+	 * @param selection

+	 *            the selection

+	 *

+	 * @return the new model page, or {@code null} if none

+	 */

+	protected NewCHESSModelPage createNewModelPage(IStructuredSelection selection) {

+		if (wizard.isCreateProjectWizard() || wizard.isCreateMultipleModelsWizard()) {

+

+			return null;

+		}

+

+		if (isCreateFromExistingDomainModel()) {

+			URI uri = getSelectedResourceURI(selection);

+			if (uri != null) {

+				uri = uri.trimFileExtension().appendFileExtension(wizard.getDiagramFileExtension(null));

+				return new NewDiagramForExistingModelPage(selection, wizard.getModelKindName(), bus, uri.lastSegment());

+			}

+		}

+

+		return new NewCHESSModelPage(selection, bus, wizard.getModelKindName());

+	}

+

+	protected boolean isCreateFromExistingDomainModel() {

+		return false;

+	}

+

+	@Override

+	public URI createNewModelURI(String categoryId) {

+		return newModelPage.createNewModelResourceURI();

+	}

+

+	@Override

+	public IEditorInput createEditorInput(URI uri) {

+		return new PapyrusCDOEditorInput(uri, uri.trimFileExtension().lastSegment());

+	}

+

+//	private SelectDiagramCategoryPage createNewDiagramCategoryPage(IStructuredSelection selection) {

+//		if (wizard.isCreateProjectWizard() || wizard.isCreateMultipleModelsWizard() || !wizard.isPapyrusRootWizard()) {

+//			return null;

+//		}

+//

+//		return new SelectDiagramCategoryPage();

+//	}

+

+

+	//

+	// Nested types

+	//

+

+	/**

+	 * This is the NewDiagramForExistingModelPage type. Enjoy.

+	 */

+	protected static class NewDiagramForExistingModelPage extends NewCHESSModelPage {

+

+		/** The my diagram resource name. */

+		private final String myDiagramResourceName;

+

+		/**

+		 * Instantiates a new new diagram for existing model page.

+		 *

+		 * @param selection

+		 *            the selection

+		 * @param modelKindName

+		 *            the user-presentable (translatable) name of the kind of

+		 *            model to create

+		 * @param bus

+		 *            an event bus for posting events

+		 * @param defaultResourceName

+		 *            the default resource name

+		 */

+		public NewDiagramForExistingModelPage(IStructuredSelection selection, String modelKindName, EventBus bus, String defaultResourceName) {

+

+			super(selection, bus, modelKindName);

+

+			myDiagramResourceName = defaultResourceName;

+			setTitle("Init a new Papyrus model");

+			setDescription("Init a new Papyrus model from the existing domain model");

+		}

+

+		@Override

+		public void createControl(Composite parent) {

+			super.createControl(parent);

+

+			setNewResourceName(myDiagramResourceName);

+		}

+

+		@Override

+		protected void validatePage() {

+			super.validatePage();

+

+			if (getMessageType() < ERROR) {

+				if (!myDiagramResourceName.equals(getNewResourceName())) {

+					setMessage(NLS.bind(org.eclipse.papyrus.uml.diagram.wizards.Messages.InitModelWizard_diagram_name_is_different_from_domain_model, myDiagramResourceName), ERROR);

+					setPageComplete(false);

+				}

+			}

+		};

+	}

+	

+	public String getFolderRelativePath(){

+		return newModelPage.getFolderRelativePath();		

+	}

+	

+	public String getProjectName(){

+		return newModelPage.getProjectName();		

+	}

+}

diff --git a/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/providers/CHESSProjectListLabelProvider.java b/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/providers/CHESSProjectListLabelProvider.java
index 1442f50..7946703 100644
--- a/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/providers/CHESSProjectListLabelProvider.java
+++ b/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/providers/CHESSProjectListLabelProvider.java
@@ -1,21 +1,28 @@
-package org.polarsys.chess.cdo.providers;
-
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-
-import org.eclipse.core.resources.IProject;
-
-public class CHESSProjectListLabelProvider extends LabelProvider {
-
-
-	public Image getImage(Object element) {
-		return null;
-	}
-
-
-	public String getText(Object element) {
-		IProject resource = (IProject) element;
-		return resource.getName();
-	}
-
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

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

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

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

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

+package org.polarsys.chess.cdo.providers;

+

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

+import org.eclipse.swt.graphics.Image;

+

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

+

+public class CHESSProjectListLabelProvider extends LabelProvider {

+

+

+	public Image getImage(Object element) {

+		return null;

+	}

+

+

+	public String getText(Object element) {

+		IProject resource = (IProject) element;

+		return resource.getName();

+	}

+

+}

diff --git a/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/wizards/CreateCDOCHESSModelWizard.java b/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/wizards/CreateCDOCHESSModelWizard.java
index 6d642ec..a260440 100644
--- a/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/wizards/CreateCDOCHESSModelWizard.java
+++ b/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/wizards/CreateCDOCHESSModelWizard.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 
 */
diff --git a/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/wizards/InitCDOModelWizard.java b/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/wizards/InitCDOModelWizard.java
index de229db..579c485 100644
--- a/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/wizards/InitCDOModelWizard.java
+++ b/plugins/org.polarsys.chess.cdo/src/org/polarsys/chess/cdo/wizards/InitCDOModelWizard.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 
 */
diff --git a/plugins/org.polarsys.chess.chessmlprofile/about.html b/plugins/org.polarsys.chess.chessmlprofile/about.html
index dd3c089..164f781 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/about.html
+++ b/plugins/org.polarsys.chess.chessmlprofile/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>November 14, 2008</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.chessmlprofile/build.properties b/plugins/org.polarsys.chess.chessmlprofile/build.properties
index b72912f..ef0c014 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/build.properties
+++ b/plugins/org.polarsys.chess.chessmlprofile/build.properties
@@ -4,9 +4,9 @@
 #  *
 #  *    
 #  * All rights reserved. This program and the accompanying materials
-#  * are made available under the terms of the Eclipse Public License v1.0
+#  * are made available under the terms of the Eclipse Public License v2.0
 #  * which accompanies this distribution, and is available at
-#  * http://www.eclipse.org/legal/epl-v10.html
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  *
 #  *
 #  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/plugin.properties b/plugins/org.polarsys.chess.chessmlprofile/plugin.properties
index 6e778fe..88d2e5b 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/plugin.properties
+++ b/plugins/org.polarsys.chess.chessmlprofile/plugin.properties
@@ -4,9 +4,9 @@
 #  *
 #  *    
 #  * All rights reserved. This program and the accompanying materials
-#  * are made available under the terms of the Eclipse Public License v1.0
+#  * are made available under the terms of the Eclipse Public License v2.0
 #  * which accompanies this distribution, and is available at
-#  * http://www.eclipse.org/legal/epl-v10.html
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  *
 #  *
 #  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/ComponentImplementation.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/ComponentImplementation.java
index a1696cd..359b70d 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/ComponentImplementation.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/ComponentImplementation.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/ComponentModelFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/ComponentModelFactory.java
index 49fcc34..5f8f5a3 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/ComponentModelFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/ComponentModelFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/ComponentModelPackage.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/ComponentModelPackage.java
index be485cb..ae3f37f 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/ComponentModelPackage.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/ComponentModelPackage.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/ComponentType.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/ComponentType.java
index e987933..38cb775 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/ComponentType.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/ComponentType.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/FunctionalPartition.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/FunctionalPartition.java
index b2892c1..77f20c7 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/FunctionalPartition.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/FunctionalPartition.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/impl/ComponentImplementationImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/impl/ComponentImplementationImpl.java
index 14d16c2..bccbd73 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/impl/ComponentImplementationImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/impl/ComponentImplementationImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/impl/ComponentModelFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/impl/ComponentModelFactoryImpl.java
index 96a96d6..eaa9615 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/impl/ComponentModelFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/impl/ComponentModelFactoryImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/impl/ComponentModelPackageImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/impl/ComponentModelPackageImpl.java
index 720f9ba..0f3486c 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/impl/ComponentModelPackageImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/impl/ComponentModelPackageImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/impl/ComponentTypeImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/impl/ComponentTypeImpl.java
index 302e1b7..e54db43 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/impl/ComponentTypeImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/impl/ComponentTypeImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/impl/FunctionalPartitionImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/impl/FunctionalPartitionImpl.java
index 4e13f36..e5c3ad0 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/impl/FunctionalPartitionImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/impl/FunctionalPartitionImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/util/ComponentModelAdapterFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/util/ComponentModelAdapterFactory.java
index d1e70e7..a5083c3 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/util/ComponentModelAdapterFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/util/ComponentModelAdapterFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/util/ComponentModelResourceFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/util/ComponentModelResourceFactoryImpl.java
index 79b23c4..de530b2 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/util/ComponentModelResourceFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/util/ComponentModelResourceFactoryImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/util/ComponentModelResourceImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/util/ComponentModelResourceImpl.java
index 803201f..b6a60fb 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/util/ComponentModelResourceImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/util/ComponentModelResourceImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/util/ComponentModelSwitch.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/util/ComponentModelSwitch.java
index 25c9563..95692fa 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/util/ComponentModelSwitch.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/util/ComponentModelSwitch.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/util/ComponentModelXMLProcessor.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/util/ComponentModelXMLProcessor.java
index 4333338..a0a85e6 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/util/ComponentModelXMLProcessor.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/ComponentModel/util/ComponentModelXMLProcessor.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESS.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESS.java
index 815bd8e..de83cbb 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESS.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESS.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/AnalysisView.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/AnalysisView.java
index f65ab88..fe0f72d 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/AnalysisView.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/AnalysisView.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/CHESSViewsFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/CHESSViewsFactory.java
index 8e27e44..61d680a 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/CHESSViewsFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/CHESSViewsFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/CHESSViewsPackage.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/CHESSViewsPackage.java
index 1917132..71d5f15 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/CHESSViewsPackage.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/CHESSViewsPackage.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/ComponentView.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/ComponentView.java
index f8e8042..c825979 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/ComponentView.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/ComponentView.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/DependabilityAnalysisView.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/DependabilityAnalysisView.java
index f844ace..aa8855c 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/DependabilityAnalysisView.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/DependabilityAnalysisView.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/DeploymentView.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/DeploymentView.java
index ab055de..74ccfda 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/DeploymentView.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/DeploymentView.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/ExtraFunctionalView.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/ExtraFunctionalView.java
index 540a4bb..6496d24 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/ExtraFunctionalView.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/ExtraFunctionalView.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/PSMView.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/PSMView.java
index b4c6536..62d218f 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/PSMView.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/PSMView.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/RTAnalysisView.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/RTAnalysisView.java
index 7b42ba3..a151dbb 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/RTAnalysisView.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/RTAnalysisView.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/RequirementView.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/RequirementView.java
index 17468dd..688fe1a 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/RequirementView.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/RequirementView.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/SystemView.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/SystemView.java
index 6499360..cfe9018 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/SystemView.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/SystemView.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/TimingDataFlowView.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/TimingDataFlowView.java
index 4dbd7ee..fb2e187 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/TimingDataFlowView.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/TimingDataFlowView.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/AnalysisViewImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/AnalysisViewImpl.java
index a360d25..ba152c7 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/AnalysisViewImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/AnalysisViewImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/CHESSViewsFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/CHESSViewsFactoryImpl.java
index a396111..9f3c423 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/CHESSViewsFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/CHESSViewsFactoryImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/CHESSViewsPackageImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/CHESSViewsPackageImpl.java
index d1abc5d..b19bbe8 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/CHESSViewsPackageImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/CHESSViewsPackageImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/ComponentViewImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/ComponentViewImpl.java
index 69e9cb1..6a281a8 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/ComponentViewImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/ComponentViewImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/DependabilityAnalysisViewImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/DependabilityAnalysisViewImpl.java
index a2a0445..67180a6 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/DependabilityAnalysisViewImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/DependabilityAnalysisViewImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/DeploymentViewImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/DeploymentViewImpl.java
index 61bef19..17864b3 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/DeploymentViewImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/DeploymentViewImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/ExtraFunctionalViewImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/ExtraFunctionalViewImpl.java
index 55893c1..8807095 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/ExtraFunctionalViewImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/ExtraFunctionalViewImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/PSMViewImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/PSMViewImpl.java
index 5aa38a4..80d3099 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/PSMViewImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/PSMViewImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/RTAnalysisViewImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/RTAnalysisViewImpl.java
index ad1c599..fca48b1 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/RTAnalysisViewImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/RTAnalysisViewImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/RequirementViewImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/RequirementViewImpl.java
index 21c3d8f..3f5265f 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/RequirementViewImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/RequirementViewImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/SystemViewImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/SystemViewImpl.java
index 7224977..d744c96 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/SystemViewImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/SystemViewImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/TimingDataFlowViewImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/TimingDataFlowViewImpl.java
index f6d0c12..b8af6a7 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/TimingDataFlowViewImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/impl/TimingDataFlowViewImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/util/CHESSViewsAdapterFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/util/CHESSViewsAdapterFactory.java
index e358008..aa971cd 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/util/CHESSViewsAdapterFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/util/CHESSViewsAdapterFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/util/CHESSViewsResourceFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/util/CHESSViewsResourceFactoryImpl.java
index 9735827..17881c9 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/util/CHESSViewsResourceFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/util/CHESSViewsResourceFactoryImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/util/CHESSViewsResourceImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/util/CHESSViewsResourceImpl.java
index cf04e7c..b1e86da 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/util/CHESSViewsResourceImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/util/CHESSViewsResourceImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/util/CHESSViewsSwitch.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/util/CHESSViewsSwitch.java
index e75833e..31cd77f 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/util/CHESSViewsSwitch.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/util/CHESSViewsSwitch.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/util/CHESSViewsXMLProcessor.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/util/CHESSViewsXMLProcessor.java
index 87044fb..22df16d 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/util/CHESSViewsXMLProcessor.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHESSViews/util/CHESSViewsXMLProcessor.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHGaResourcePlatform.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHGaResourcePlatform.java
index 1b37833..1c64e62 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHGaResourcePlatform.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CHGaResourcePlatform.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CoreFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CoreFactory.java
index 4234fb9..a95c1c5 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CoreFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CoreFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CorePackage.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CorePackage.java
index 500aa35..2705b0d 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CorePackage.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/CorePackage.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/FunctionalPartitions.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/FunctionalPartitions.java
index c5fbf80..b46d421 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/FunctionalPartitions.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/FunctionalPartitions.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/IdentifInstance.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/IdentifInstance.java
index 4cd483d..9ee1166 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/IdentifInstance.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/IdentifInstance.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/IdentifSlot.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/IdentifSlot.java
index bdc5111..781f4fd 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/IdentifSlot.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/IdentifSlot.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/MultiInstance.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/MultiInstance.java
index bdf5887..b876d3b 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/MultiInstance.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/MultiInstance.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/MultiSlot.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/MultiSlot.java
index 60c40aa..ecc79ac 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/MultiSlot.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/MultiSlot.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/PSMPackage.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/PSMPackage.java
index 483a9c6..f4f603b 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/PSMPackage.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/PSMPackage.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/impl/CHESSImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/impl/CHESSImpl.java
index 116ac52..2cbeeb9 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/impl/CHESSImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/impl/CHESSImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/impl/CHGaResourcePlatformImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/impl/CHGaResourcePlatformImpl.java
index 798ce5e..18d8f45 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/impl/CHGaResourcePlatformImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/impl/CHGaResourcePlatformImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/impl/CoreFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/impl/CoreFactoryImpl.java
index 15a2b86..d6515ad 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/impl/CoreFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/impl/CoreFactoryImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/impl/CorePackageImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/impl/CorePackageImpl.java
index 41b315a..8ba172b 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/impl/CorePackageImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/impl/CorePackageImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/impl/PSMPackageImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/impl/PSMPackageImpl.java
index bb69137..7ddba1d 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/impl/PSMPackageImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/impl/PSMPackageImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/util/CoreAdapterFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/util/CoreAdapterFactory.java
index 58d9ac5..e572cf8 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/util/CoreAdapterFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/util/CoreAdapterFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/util/CoreResourceFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/util/CoreResourceFactoryImpl.java
index 98995b6..e270a17 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/util/CoreResourceFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/util/CoreResourceFactoryImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/util/CoreResourceImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/util/CoreResourceImpl.java
index 567d558..f6dea3a 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/util/CoreResourceImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/util/CoreResourceImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/util/CoreSwitch.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/util/CoreSwitch.java
index 8f94900..d6b6ac2 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/util/CoreSwitch.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/util/CoreSwitch.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/util/CoreXMLProcessor.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/util/CoreXMLProcessor.java
index e25d31f..fecf806 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/util/CoreXMLProcessor.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Core/util/CoreXMLProcessor.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/DependableComponent.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/DependableComponent.java
index ec49274..5f730d4 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/DependableComponent.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/DependableComponent.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/DependableComponentFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/DependableComponentFactory.java
index bb146e3..adf1763 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/DependableComponentFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/DependableComponentFactory.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/DependableComponentPackage.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/DependableComponentPackage.java
index e4917df..d4f322d 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/DependableComponentPackage.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/DependableComponentPackage.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/FailureMode.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/FailureMode.java
index 2a5b048..305f741 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/FailureMode.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/FailureMode.java
@@ -3,9 +3,9 @@
  *  *

  *  *    

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

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

+ *  * are made available under the terms of the Eclipse Public License v2.0

  *  * which accompanies this distribution, and is available at

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

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

  *  *

  *******************************************************************************/

 /**

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/Propagation.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/Propagation.java
index cf17a4f..eb87c13 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/Propagation.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/Propagation.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/impl/DependableComponentFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/impl/DependableComponentFactoryImpl.java
index c99726e..8bf70c8 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/impl/DependableComponentFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/impl/DependableComponentFactoryImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/impl/DependableComponentImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/impl/DependableComponentImpl.java
index aa9f30d..0c8aa28 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/impl/DependableComponentImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/impl/DependableComponentImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/impl/DependableComponentPackageImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/impl/DependableComponentPackageImpl.java
index c8ca2ff..d74b3ed 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/impl/DependableComponentPackageImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/impl/DependableComponentPackageImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/impl/FailureModeImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/impl/FailureModeImpl.java
index b81a3af..64a467b 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/impl/FailureModeImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/impl/FailureModeImpl.java
@@ -3,9 +3,9 @@
  *  *

  *  *    

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

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

+ *  * are made available under the terms of the Eclipse Public License v2.0

  *  * which accompanies this distribution, and is available at

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

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

  *  *

  *******************************************************************************/

 /**

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/util/DependableComponentAdapterFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/util/DependableComponentAdapterFactory.java
index aae2b7d..70a9d9e 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/util/DependableComponentAdapterFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/util/DependableComponentAdapterFactory.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/util/DependableComponentResourceFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/util/DependableComponentResourceFactoryImpl.java
index b25143c..50d1c8b 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/util/DependableComponentResourceFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/util/DependableComponentResourceFactoryImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/util/DependableComponentResourceImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/util/DependableComponentResourceImpl.java
index 6395088..f530a44 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/util/DependableComponentResourceImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/util/DependableComponentResourceImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/util/DependableComponentSwitch.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/util/DependableComponentSwitch.java
index f676a4f..eddc913 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/util/DependableComponentSwitch.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/util/DependableComponentSwitch.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/util/DependableComponentXMLProcessor.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/util/DependableComponentXMLProcessor.java
index f2ddc55..d2c830d 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/util/DependableComponentXMLProcessor.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/DependableComponent/util/DependableComponentXMLProcessor.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/ACIDAvoidable.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/ACIDAvoidable.java
index e9cbeca..bfb781f 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/ACIDAvoidable.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/ACIDAvoidable.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/ACIDMitigation.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/ACIDMitigation.java
index ee5b666..752711c 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/ACIDMitigation.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/ACIDMitigation.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FI4FA.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FI4FA.java
index da9739d..41e2ce3 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FI4FA.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FI4FA.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FI4FAAnalysis.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FI4FAAnalysis.java
index 8992fa7..a012000 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FI4FAAnalysis.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FI4FAAnalysis.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FI4FASpecification.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FI4FASpecification.java
index e2b0c60..681a2f8 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FI4FASpecification.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FI4FASpecification.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FPTC.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FPTC.java
index 7310d3a..6ed97e7 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FPTC.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FPTC.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FPTCPortSlot.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FPTCPortSlot.java
index 3a9f192..00df4cc 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FPTCPortSlot.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FPTCPortSlot.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FPTCSpecification.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FPTCSpecification.java
index 25bcb25..ba814d6 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FPTCSpecification.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FPTCSpecification.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationAnalysis.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationAnalysis.java
index bcd83d5..40171bf 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationAnalysis.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationAnalysis.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/A_avoidable.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/A_avoidable.java
index 6918536..e9fd746 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/A_avoidable.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/A_avoidable.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/A_mitigation.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/A_mitigation.java
index 6f9a909..dbe1fc7 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/A_mitigation.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/A_mitigation.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/C_avoidable.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/C_avoidable.java
index 42ebbea..85db1df 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/C_avoidable.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/C_avoidable.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/C_mitigation.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/C_mitigation.java
index 3afb0c2..ae5477a 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/C_mitigation.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/C_mitigation.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/D_avoidable.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/D_avoidable.java
index 68bb200..7516029 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/D_avoidable.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/D_avoidable.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/D_mitigation.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/D_mitigation.java
index f845a88..95fc50c 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/D_mitigation.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/D_mitigation.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/FailurePropagationDataTypesFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/FailurePropagationDataTypesFactory.java
index 8feecfc..757811c 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/FailurePropagationDataTypesFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/FailurePropagationDataTypesFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/FailurePropagationDataTypesPackage.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/FailurePropagationDataTypesPackage.java
index e096d19..923dd91 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/FailurePropagationDataTypesPackage.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/FailurePropagationDataTypesPackage.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/FailureType.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/FailureType.java
index daba5b9..4e66b30 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/FailureType.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/FailureType.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/I_avoidable.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/I_avoidable.java
index 0abd77f..021a8ba 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/I_avoidable.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/I_avoidable.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/I_mitigation.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/I_mitigation.java
index 06ff9b2..56bc341 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/I_mitigation.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/I_mitigation.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/impl/FailurePropagationDataTypesFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/impl/FailurePropagationDataTypesFactoryImpl.java
index 05e18bd..6f075ea 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/impl/FailurePropagationDataTypesFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/impl/FailurePropagationDataTypesFactoryImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/impl/FailurePropagationDataTypesPackageImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/impl/FailurePropagationDataTypesPackageImpl.java
index 1661d68..8cc448c 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/impl/FailurePropagationDataTypesPackageImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationDataTypes/impl/FailurePropagationDataTypesPackageImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationFactory.java
index 7f4797c..d02f75f 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationPackage.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationPackage.java
index 11bc6ec..a333c3c 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationPackage.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/FailurePropagationPackage.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/ACIDAvoidableImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/ACIDAvoidableImpl.java
index 58796b9..cf8813e 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/ACIDAvoidableImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/ACIDAvoidableImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/ACIDMitigationImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/ACIDMitigationImpl.java
index 5305263..fcbe7c9 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/ACIDMitigationImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/ACIDMitigationImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FI4FAAnalysisImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FI4FAAnalysisImpl.java
index 8596b0b..28a66ab 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FI4FAAnalysisImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FI4FAAnalysisImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FI4FAImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FI4FAImpl.java
index f3983f9..09ad763 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FI4FAImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FI4FAImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FI4FASpecificationImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FI4FASpecificationImpl.java
index 4645ec1..33b8c27 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FI4FASpecificationImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FI4FASpecificationImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FPTCImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FPTCImpl.java
index 3f85616..7d38f46 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FPTCImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FPTCImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FPTCPortSlotImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FPTCPortSlotImpl.java
index e083375..0f78c77 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FPTCPortSlotImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FPTCPortSlotImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FPTCSpecificationImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FPTCSpecificationImpl.java
index 1e872d8..ff55962 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FPTCSpecificationImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FPTCSpecificationImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FailurePropagationAnalysisImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FailurePropagationAnalysisImpl.java
index 842d2cf..9381bd6 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FailurePropagationAnalysisImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FailurePropagationAnalysisImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FailurePropagationFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FailurePropagationFactoryImpl.java
index 972093d..2ef7128 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FailurePropagationFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FailurePropagationFactoryImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FailurePropagationPackageImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FailurePropagationPackageImpl.java
index 2bce78f..11ee257 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FailurePropagationPackageImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/impl/FailurePropagationPackageImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/util/FailurePropagationAdapterFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/util/FailurePropagationAdapterFactory.java
index bfe7590..de94c55 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/util/FailurePropagationAdapterFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/util/FailurePropagationAdapterFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/util/FailurePropagationResourceFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/util/FailurePropagationResourceFactoryImpl.java
index 21bc6b3..f75f3b3 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/util/FailurePropagationResourceFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/util/FailurePropagationResourceFactoryImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/util/FailurePropagationResourceImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/util/FailurePropagationResourceImpl.java
index 9796a9b..e796ebc 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/util/FailurePropagationResourceImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/util/FailurePropagationResourceImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/util/FailurePropagationSwitch.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/util/FailurePropagationSwitch.java
index fcb456d..345ca5a 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/util/FailurePropagationSwitch.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/util/FailurePropagationSwitch.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/util/FailurePropagationXMLProcessor.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/util/FailurePropagationXMLProcessor.java
index 2f09eee..0143482 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/util/FailurePropagationXMLProcessor.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/FailurePropagation/util/FailurePropagationXMLProcessor.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/MitigationMeansFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/MitigationMeansFactory.java
index 73c80cc..d4ceb8b 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/MitigationMeansFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/MitigationMeansFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/MitigationMeansPackage.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/MitigationMeansPackage.java
index 1d634af..2cc3d2f 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/MitigationMeansPackage.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/MitigationMeansPackage.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/TransmissionWithProtocol.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/TransmissionWithProtocol.java
index 50f85a8..85624fd 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/TransmissionWithProtocol.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/TransmissionWithProtocol.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/impl/MitigationMeansFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/impl/MitigationMeansFactoryImpl.java
index 31ac5aa..b533bba 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/impl/MitigationMeansFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/impl/MitigationMeansFactoryImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/impl/MitigationMeansPackageImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/impl/MitigationMeansPackageImpl.java
index 6ed979a..0d18b0c 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/impl/MitigationMeansPackageImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/impl/MitigationMeansPackageImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/impl/TransmissionWithProtocolImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/impl/TransmissionWithProtocolImpl.java
index 7036fac..a4c6f07 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/impl/TransmissionWithProtocolImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/impl/TransmissionWithProtocolImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/util/MitigationMeansAdapterFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/util/MitigationMeansAdapterFactory.java
index e2327d6..40c375f 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/util/MitigationMeansAdapterFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/util/MitigationMeansAdapterFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/util/MitigationMeansResourceFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/util/MitigationMeansResourceFactoryImpl.java
index 6c4e9e9..d5b6176 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/util/MitigationMeansResourceFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/util/MitigationMeansResourceFactoryImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/util/MitigationMeansResourceImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/util/MitigationMeansResourceImpl.java
index 8b726a1..81a92e3 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/util/MitigationMeansResourceImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/util/MitigationMeansResourceImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/util/MitigationMeansSwitch.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/util/MitigationMeansSwitch.java
index e92776a..b786d2e 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/util/MitigationMeansSwitch.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/util/MitigationMeansSwitch.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/util/MitigationMeansXMLProcessor.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/util/MitigationMeansXMLProcessor.java
index a72dbdf..84000d0 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/util/MitigationMeansXMLProcessor.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/MitigationMeans/util/MitigationMeansXMLProcessor.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/Adjudicator.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/Adjudicator.java
index 35f6e47..ae90e8f 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/Adjudicator.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/Adjudicator.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/FaultToleranceFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/FaultToleranceFactory.java
index 15472fc..ea1fb21 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/FaultToleranceFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/FaultToleranceFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/FaultTolerancePackage.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/FaultTolerancePackage.java
index b93d036..b0dbf8a 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/FaultTolerancePackage.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/FaultTolerancePackage.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/FaultTolerant.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/FaultTolerant.java
index f2c7fb0..4577191 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/FaultTolerant.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/FaultTolerant.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/RedundancyManager.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/RedundancyManager.java
index c73cfe5..2bda0d4 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/RedundancyManager.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/RedundancyManager.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/Variant.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/Variant.java
index 26da35d..509c2c7 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/Variant.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/Variant.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/impl/AdjudicatorImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/impl/AdjudicatorImpl.java
index d778b66..d9b1305 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/impl/AdjudicatorImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/impl/AdjudicatorImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/impl/FaultToleranceFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/impl/FaultToleranceFactoryImpl.java
index 4e6f214..39f2d9d 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/impl/FaultToleranceFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/impl/FaultToleranceFactoryImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/impl/FaultTolerancePackageImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/impl/FaultTolerancePackageImpl.java
index ce02abb..e5462fe 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/impl/FaultTolerancePackageImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/impl/FaultTolerancePackageImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/impl/FaultTolerantImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/impl/FaultTolerantImpl.java
index 909db1f..c260740 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/impl/FaultTolerantImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/impl/FaultTolerantImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/impl/RedundancyManagerImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/impl/RedundancyManagerImpl.java
index f2c143e..d765f7f 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/impl/RedundancyManagerImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/impl/RedundancyManagerImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/impl/VariantImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/impl/VariantImpl.java
index ac76dcf..dfdee01 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/impl/VariantImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/impl/VariantImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/util/FaultToleranceAdapterFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/util/FaultToleranceAdapterFactory.java
index 32cedde..a399e3b 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/util/FaultToleranceAdapterFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/util/FaultToleranceAdapterFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/util/FaultToleranceResourceFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/util/FaultToleranceResourceFactoryImpl.java
index 613781d..699fafd 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/util/FaultToleranceResourceFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/util/FaultToleranceResourceFactoryImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/util/FaultToleranceResourceImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/util/FaultToleranceResourceImpl.java
index 9615a5b..2c620e9 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/util/FaultToleranceResourceImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/util/FaultToleranceResourceImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/util/FaultToleranceSwitch.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/util/FaultToleranceSwitch.java
index d181855..da6c0c3 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/util/FaultToleranceSwitch.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/util/FaultToleranceSwitch.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/util/FaultToleranceXMLProcessor.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/util/FaultToleranceXMLProcessor.java
index 35053e0..ba97db4 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/util/FaultToleranceXMLProcessor.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/FaultTolerance/util/FaultToleranceXMLProcessor.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/ErrorDetection.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/ErrorDetection.java
index 15eb645..ae9047c 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/ErrorDetection.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/ErrorDetection.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/FailureDetection.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/FailureDetection.java
index 93a5d74..c1cce9d 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/FailureDetection.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/FailureDetection.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/MMActivities.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/MMActivities.java
index 799333d..23d30cb 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/MMActivities.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/MMActivities.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/MaintenanceMonitoringFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/MaintenanceMonitoringFactory.java
index fdb2111..71245bd 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/MaintenanceMonitoringFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/MaintenanceMonitoringFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/MaintenanceMonitoringPackage.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/MaintenanceMonitoringPackage.java
index ec67c29..a3ebf27 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/MaintenanceMonitoringPackage.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/MaintenanceMonitoringPackage.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/Repair.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/Repair.java
index 8bf303a..0962e71 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/Repair.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/Repair.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/Replace.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/Replace.java
index 9867997..0a0f0e8 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/Replace.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/Replace.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/impl/ErrorDetectionImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/impl/ErrorDetectionImpl.java
index 195a443..8c5b677 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/impl/ErrorDetectionImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/impl/ErrorDetectionImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/impl/FailureDetectionImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/impl/FailureDetectionImpl.java
index c5dad0b..7f55cee 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/impl/FailureDetectionImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/impl/FailureDetectionImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/impl/MMActivitiesImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/impl/MMActivitiesImpl.java
index 4ebb67f..7958989 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/impl/MMActivitiesImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/impl/MMActivitiesImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/impl/MaintenanceMonitoringFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/impl/MaintenanceMonitoringFactoryImpl.java
index 645ed38..c3bfdcd 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/impl/MaintenanceMonitoringFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/impl/MaintenanceMonitoringFactoryImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/impl/MaintenanceMonitoringPackageImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/impl/MaintenanceMonitoringPackageImpl.java
index 8a0255a..20508be 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/impl/MaintenanceMonitoringPackageImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/impl/MaintenanceMonitoringPackageImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/impl/RepairImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/impl/RepairImpl.java
index a2c87a5..974a46f 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/impl/RepairImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/impl/RepairImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/impl/ReplaceImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/impl/ReplaceImpl.java
index e046fee..30a12ff 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/impl/ReplaceImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/impl/ReplaceImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/util/MaintenanceMonitoringAdapterFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/util/MaintenanceMonitoringAdapterFactory.java
index 2476b4c..6df17b8 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/util/MaintenanceMonitoringAdapterFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/util/MaintenanceMonitoringAdapterFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/util/MaintenanceMonitoringResourceFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/util/MaintenanceMonitoringResourceFactoryImpl.java
index 4933c89..71fd63d 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/util/MaintenanceMonitoringResourceFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/util/MaintenanceMonitoringResourceFactoryImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/util/MaintenanceMonitoringResourceImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/util/MaintenanceMonitoringResourceImpl.java
index baa0bae..7fcf3b8 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/util/MaintenanceMonitoringResourceImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/util/MaintenanceMonitoringResourceImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/util/MaintenanceMonitoringSwitch.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/util/MaintenanceMonitoringSwitch.java
index d6381d3..a527df3 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/util/MaintenanceMonitoringSwitch.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/util/MaintenanceMonitoringSwitch.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/util/MaintenanceMonitoringXMLProcessor.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/util/MaintenanceMonitoringXMLProcessor.java
index 6c316ec..18d912c 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/util/MaintenanceMonitoringXMLProcessor.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/MaintenanceMonitoring/util/MaintenanceMonitoringXMLProcessor.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/StateBasedAnalysis.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/StateBasedAnalysis.java
index dc8803b..9c3b653 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/StateBasedAnalysis.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/StateBasedAnalysis.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/StateBasedAnalysisFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/StateBasedAnalysisFactory.java
index e46c6d3..4f0de5d 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/StateBasedAnalysisFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/StateBasedAnalysisFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/StateBasedAnalysisPackage.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/StateBasedAnalysisPackage.java
index edd1bac..b94a07b 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/StateBasedAnalysisPackage.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/StateBasedAnalysisPackage.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/impl/StateBasedAnalysisFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/impl/StateBasedAnalysisFactoryImpl.java
index 3cf6055..f0fd901 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/impl/StateBasedAnalysisFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/impl/StateBasedAnalysisFactoryImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/impl/StateBasedAnalysisImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/impl/StateBasedAnalysisImpl.java
index 7b32b77..65c263a 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/impl/StateBasedAnalysisImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/impl/StateBasedAnalysisImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/impl/StateBasedAnalysisPackageImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/impl/StateBasedAnalysisPackageImpl.java
index f55ca38..39931c3 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/impl/StateBasedAnalysisPackageImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/impl/StateBasedAnalysisPackageImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/util/StateBasedAnalysisAdapterFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/util/StateBasedAnalysisAdapterFactory.java
index 688e38a..758b6d6 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/util/StateBasedAnalysisAdapterFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/util/StateBasedAnalysisAdapterFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/util/StateBasedAnalysisResourceFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/util/StateBasedAnalysisResourceFactoryImpl.java
index 58b20f2..9d4ab82 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/util/StateBasedAnalysisResourceFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/util/StateBasedAnalysisResourceFactoryImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/util/StateBasedAnalysisResourceImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/util/StateBasedAnalysisResourceImpl.java
index ebd9758..8f827df 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/util/StateBasedAnalysisResourceImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/util/StateBasedAnalysisResourceImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/util/StateBasedAnalysisSwitch.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/util/StateBasedAnalysisSwitch.java
index 1caa335..97bac33 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/util/StateBasedAnalysisSwitch.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/util/StateBasedAnalysisSwitch.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/util/StateBasedAnalysisXMLProcessor.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/util/StateBasedAnalysisXMLProcessor.java
index db72a6d..74e67f4 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/util/StateBasedAnalysisXMLProcessor.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedAnalysis/util/StateBasedAnalysisXMLProcessor.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/StateBasedComponentsFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/StateBasedComponentsFactory.java
index 36c5953..0450ecf 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/StateBasedComponentsFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/StateBasedComponentsFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/StateBasedComponentsPackage.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/StateBasedComponentsPackage.java
index c055532..81bfa98 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/StateBasedComponentsPackage.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/StateBasedComponentsPackage.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/StatefulHardware.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/StatefulHardware.java
index a107537..d4a970a 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/StatefulHardware.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/StatefulHardware.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/StatefulSoftware.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/StatefulSoftware.java
index 121066f..78b53f6 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/StatefulSoftware.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/StatefulSoftware.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/StatelessHardware.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/StatelessHardware.java
index 2158a11..ea630bd 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/StatelessHardware.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/StatelessHardware.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/StatelessSoftware.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/StatelessSoftware.java
index 0ae3dce..e601c29 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/StatelessSoftware.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/StatelessSoftware.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/StochasticFailureBehaviour.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/StochasticFailureBehaviour.java
index 9387160..2ea3f26 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/StochasticFailureBehaviour.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/StochasticFailureBehaviour.java
@@ -3,9 +3,9 @@
  *  *

  *  *    

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

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

+ *  * are made available under the terms of the Eclipse Public License v2.0

  *  * which accompanies this distribution, and is available at

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

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

  *  *

  *******************************************************************************/

 /**

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/impl/StateBasedComponentsFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/impl/StateBasedComponentsFactoryImpl.java
index 079c34f..2b4c47f 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/impl/StateBasedComponentsFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/impl/StateBasedComponentsFactoryImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/impl/StateBasedComponentsPackageImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/impl/StateBasedComponentsPackageImpl.java
index 2ed42b5..bb730ff 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/impl/StateBasedComponentsPackageImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/impl/StateBasedComponentsPackageImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/impl/StatefulHardwareImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/impl/StatefulHardwareImpl.java
index 4a54acb..3b87c28 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/impl/StatefulHardwareImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/impl/StatefulHardwareImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/impl/StatefulSoftwareImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/impl/StatefulSoftwareImpl.java
index 075eabe..aa9e9bb 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/impl/StatefulSoftwareImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/impl/StatefulSoftwareImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/impl/StatelessHardwareImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/impl/StatelessHardwareImpl.java
index e9b4f96..01225bd 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/impl/StatelessHardwareImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/impl/StatelessHardwareImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/impl/StatelessSoftwareImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/impl/StatelessSoftwareImpl.java
index 65fb494..7a6c211 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/impl/StatelessSoftwareImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/impl/StatelessSoftwareImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/impl/StochasticFailureBehaviourImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/impl/StochasticFailureBehaviourImpl.java
index 08dcbe3..4674987 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/impl/StochasticFailureBehaviourImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/impl/StochasticFailureBehaviourImpl.java
@@ -3,9 +3,9 @@
  *  *

  *  *    

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

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

+ *  * are made available under the terms of the Eclipse Public License v2.0

  *  * which accompanies this distribution, and is available at

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

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

  *  *

  *******************************************************************************/

 /**

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/util/StateBasedComponentsAdapterFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/util/StateBasedComponentsAdapterFactory.java
index 5102c25..12ffdbd 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/util/StateBasedComponentsAdapterFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/util/StateBasedComponentsAdapterFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/util/StateBasedComponentsResourceFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/util/StateBasedComponentsResourceFactoryImpl.java
index 34816bc..f6a5623 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/util/StateBasedComponentsResourceFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/util/StateBasedComponentsResourceFactoryImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/util/StateBasedComponentsResourceImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/util/StateBasedComponentsResourceImpl.java
index cb7dc15..41285b3 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/util/StateBasedComponentsResourceImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/util/StateBasedComponentsResourceImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/util/StateBasedComponentsSwitch.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/util/StateBasedComponentsSwitch.java
index f12912a..7a8571a 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/util/StateBasedComponentsSwitch.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/util/StateBasedComponentsSwitch.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/util/StateBasedComponentsXMLProcessor.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/util/StateBasedComponentsXMLProcessor.java
index 9fa703f..fe42f85 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/util/StateBasedComponentsXMLProcessor.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedComponents/util/StateBasedComponentsXMLProcessor.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/Availability.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/Availability.java
index 7b7b711..bd9328d 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/Availability.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/Availability.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/ConfidenceKind.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/ConfidenceKind.java
index 481cd56..d86696c 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/ConfidenceKind.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/ConfidenceKind.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/DependabilityMeasure.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/DependabilityMeasure.java
index 27dd3b7..c0bcae7 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/DependabilityMeasure.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/DependabilityMeasure.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/EvaluationAnalytical.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/EvaluationAnalytical.java
index ee327f7..b8aeccc 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/EvaluationAnalytical.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/EvaluationAnalytical.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/EvaluationBySimulation.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/EvaluationBySimulation.java
index 6c52381..051187f 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/EvaluationBySimulation.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/EvaluationBySimulation.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/EvaluationMethod.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/EvaluationMethod.java
index 7c6cbee..c4a4f15 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/EvaluationMethod.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/EvaluationMethod.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/EvaluationType.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/EvaluationType.java
index 6b2f6ab..d54a361 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/EvaluationType.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/EvaluationType.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/MTTF.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/MTTF.java
index 7c072a3..f1dbf75 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/MTTF.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/MTTF.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/RedundancyKind.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/RedundancyKind.java
index a8c020e..d0afbc4 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/RedundancyKind.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/RedundancyKind.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/Reliability.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/Reliability.java
index 126dacd..9050027 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/Reliability.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/Reliability.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/StateBasedDataTypesFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/StateBasedDataTypesFactory.java
index 2b4e739..a23d2c4 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/StateBasedDataTypesFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/StateBasedDataTypesFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/StateBasedDataTypesPackage.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/StateBasedDataTypesPackage.java
index 8b601b4..23b78e9 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/StateBasedDataTypesPackage.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/StateBasedDataTypesPackage.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/SteadyState.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/SteadyState.java
index d2f91dc..4123294 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/SteadyState.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/SteadyState.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/AvailabilityImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/AvailabilityImpl.java
index ef3eac9..26accb1 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/AvailabilityImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/AvailabilityImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/DependabilityMeasureImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/DependabilityMeasureImpl.java
index 1445f37..90e533e 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/DependabilityMeasureImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/DependabilityMeasureImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/EvaluationAnalyticalImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/EvaluationAnalyticalImpl.java
index 63c21de..5ac9955 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/EvaluationAnalyticalImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/EvaluationAnalyticalImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/EvaluationBySimulationImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/EvaluationBySimulationImpl.java
index 1987fe6..4b08487 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/EvaluationBySimulationImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/EvaluationBySimulationImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/EvaluationMethodImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/EvaluationMethodImpl.java
index c161ac5..3656781 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/EvaluationMethodImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/EvaluationMethodImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/EvaluationTypeImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/EvaluationTypeImpl.java
index 8d79af5..1a19ea7 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/EvaluationTypeImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/EvaluationTypeImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/MTTFImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/MTTFImpl.java
index 3ff4054..a0bf9df 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/MTTFImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/MTTFImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/ReliabilityImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/ReliabilityImpl.java
index b014098..de99cc0 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/ReliabilityImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/ReliabilityImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/StateBasedDataTypesFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/StateBasedDataTypesFactoryImpl.java
index 5a41081..6c361bc 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/StateBasedDataTypesFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/StateBasedDataTypesFactoryImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/StateBasedDataTypesPackageImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/StateBasedDataTypesPackageImpl.java
index 05b4f93..b8e94d6 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/StateBasedDataTypesPackageImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/StateBasedDataTypesPackageImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/SteadyStateImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/SteadyStateImpl.java
index a938e1a..4cdde6a 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/SteadyStateImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/impl/SteadyStateImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/util/StateBasedDataTypesAdapterFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/util/StateBasedDataTypesAdapterFactory.java
index 090a1fc..3982435 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/util/StateBasedDataTypesAdapterFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/util/StateBasedDataTypesAdapterFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/util/StateBasedDataTypesSwitch.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/util/StateBasedDataTypesSwitch.java
index 6ee0df0..584acdf 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/util/StateBasedDataTypesSwitch.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/StateBased/StateBasedDataTypes/util/StateBasedDataTypesSwitch.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/DegradedState.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/DegradedState.java
index ce4a847..05ca5f8 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/DegradedState.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/DegradedState.java
@@ -3,9 +3,9 @@
  *  *
  *  *    
  *  * All rights reserved. This program and the accompanying materials
- *  * are made available under the terms of the Eclipse Public License v1.0
+ *  * are made available under the terms of the Eclipse Public License v2.0
  *  * which accompanies this distribution, and is available at
- *  * http://www.eclipse.org/legal/epl-v10.html
+ *  * http://www.eclipse.org/legal/epl-v20.html
  *  *
  *******************************************************************************/
 /**
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/DepEvent.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/DepEvent.java
index 4133400..a739315 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/DepEvent.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/DepEvent.java
@@ -3,9 +3,9 @@
  *  *

  *  *    

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

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

+ *  * are made available under the terms of the Eclipse Public License v2.0

  *  * which accompanies this distribution, and is available at

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

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

  *  *

  *******************************************************************************/

 /**

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/ErrorModel.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/ErrorModel.java
index 20a70db..523607f 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/ErrorModel.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/ErrorModel.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/Failure.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/Failure.java
index f6c99dc..cdf8db9 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/Failure.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/Failure.java
@@ -3,9 +3,9 @@
  *  *

  *  *    

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

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

+ *  * are made available under the terms of the Eclipse Public License v2.0

  *  * which accompanies this distribution, and is available at

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

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

  *  *

  *******************************************************************************/

 /**

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/InternalFault.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/InternalFault.java
index 3956f4e..ef71bf3 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/InternalFault.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/InternalFault.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/InternalPropagation.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/InternalPropagation.java
index 310c642..ee6b9f2 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/InternalPropagation.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/InternalPropagation.java
@@ -3,9 +3,9 @@
  *  *

  *  *    

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

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

+ *  * are made available under the terms of the Eclipse Public License v2.0

  *  * which accompanies this distribution, and is available at

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

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

  *  *

  *******************************************************************************/

 /**

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/Inverted.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/Inverted.java
index f449546..c7e4abc 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/Inverted.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/Inverted.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/NormalInput.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/NormalInput.java
index e9aeaa8..ca2817d 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/NormalInput.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/NormalInput.java
@@ -3,9 +3,9 @@
  *  *
  *  *    
  *  * All rights reserved. This program and the accompanying materials
- *  * are made available under the terms of the Eclipse Public License v1.0
+ *  * are made available under the terms of the Eclipse Public License v2.0
  *  * which accompanies this distribution, and is available at
- *  * http://www.eclipse.org/legal/epl-v10.html
+ *  * http://www.eclipse.org/legal/epl-v20.html
  *  *
  *******************************************************************************/
 /**
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/NormalOutput.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/NormalOutput.java
index caf6678..bfd6247 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/NormalOutput.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/NormalOutput.java
@@ -3,9 +3,9 @@
  *  *
  *  *    
  *  * All rights reserved. This program and the accompanying materials
- *  * are made available under the terms of the Eclipse Public License v1.0
+ *  * are made available under the terms of the Eclipse Public License v2.0
  *  * which accompanies this distribution, and is available at
- *  * http://www.eclipse.org/legal/epl-v10.html
+ *  * http://www.eclipse.org/legal/epl-v20.html
  *  *
  *******************************************************************************/
 /**
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/RampDown.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/RampDown.java
index 825395a..0784fc2 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/RampDown.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/RampDown.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/RecoveryKind.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/RecoveryKind.java
index 03643b6..fe42df4 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/RecoveryKind.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/RecoveryKind.java
@@ -3,9 +3,9 @@
  *  *

  *  *    

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

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

+ *  * are made available under the terms of the Eclipse Public License v2.0

  *  * which accompanies this distribution, and is available at

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

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

  *  *

  *******************************************************************************/

 /**

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/StuckAt.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/StuckAt.java
index 8ac6a9f..648acde 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/StuckAt.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/StuckAt.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/StuckAtFixed.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/StuckAtFixed.java
index 11d5793..68a03f0 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/StuckAtFixed.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/StuckAtFixed.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/ThreatState.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/ThreatState.java
index fea5f7e..ba00da4 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/ThreatState.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/ThreatState.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/ThreatsPropagationFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/ThreatsPropagationFactory.java
index b976fcb..23b542b 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/ThreatsPropagationFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/ThreatsPropagationFactory.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/ThreatsPropagationPackage.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/ThreatsPropagationPackage.java
index 010bd46..938e512 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/ThreatsPropagationPackage.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/ThreatsPropagationPackage.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/DegradedStateImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/DegradedStateImpl.java
index 2fc6b92..599acba 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/DegradedStateImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/DegradedStateImpl.java
@@ -3,9 +3,9 @@
  *  *

  *  *    

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

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

+ *  * are made available under the terms of the Eclipse Public License v2.0

  *  * which accompanies this distribution, and is available at

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

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

  *  *

  *******************************************************************************/

 /**

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/DepEventImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/DepEventImpl.java
index fd55b4a..3444004 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/DepEventImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/DepEventImpl.java
@@ -3,9 +3,9 @@
  *  *

  *  *    

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

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

+ *  * are made available under the terms of the Eclipse Public License v2.0

  *  * which accompanies this distribution, and is available at

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

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

  *  *

  *******************************************************************************/

 /**

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/ErrorModelImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/ErrorModelImpl.java
index 156fb0f..5d54e84 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/ErrorModelImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/ErrorModelImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/FailureImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/FailureImpl.java
index 4cda217..8ff2b4c 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/FailureImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/FailureImpl.java
@@ -3,9 +3,9 @@
  *  *

  *  *    

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

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

+ *  * are made available under the terms of the Eclipse Public License v2.0

  *  * which accompanies this distribution, and is available at

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

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

  *  *

  *******************************************************************************/

 /**

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/InternalFaultImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/InternalFaultImpl.java
index 9b48946..36081ea 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/InternalFaultImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/InternalFaultImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

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

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

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/InternalPropagationImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/InternalPropagationImpl.java
index c92c725..972b50d 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/InternalPropagationImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/InternalPropagationImpl.java
@@ -3,9 +3,9 @@
  *  *

  *  *    

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

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

+ *  * are made available under the terms of the Eclipse Public License v2.0

  *  * which accompanies this distribution, and is available at

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

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

  *  *

  *******************************************************************************/

 /**

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/InvertedImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/InvertedImpl.java
index cd5d388..afd2dc3 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/InvertedImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/InvertedImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/NormalInputImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/NormalInputImpl.java
index 4b0a428..23e89de 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/NormalInputImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/NormalInputImpl.java
@@ -3,9 +3,9 @@
  *  *

  *  *    

  *  * All rights reserved. This program and the accompanying materials

- *  * are made available under the terms of the Eclipse Public License v1.0

+ *  * are made available under the terms of the Eclipse Public License v2.0

  *  * which accompanies this distribution, and is available at

- *  * http://www.eclipse.org/legal/epl-v10.html

+ *  * http://www.eclipse.org/legal/epl-v20.html

  *  *

  *******************************************************************************/

 /**

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/NormalOutputImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/NormalOutputImpl.java
index 27a99ea..06cbde1 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/NormalOutputImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/NormalOutputImpl.java
@@ -3,9 +3,9 @@
  *  *

  *  *    

  *  * All rights reserved. This program and the accompanying materials

- *  * are made available under the terms of the Eclipse Public License v1.0

+ *  * are made available under the terms of the Eclipse Public License v2.0

  *  * which accompanies this distribution, and is available at

- *  * http://www.eclipse.org/legal/epl-v10.html

+ *  * http://www.eclipse.org/legal/epl-v20.html

  *  *

  *******************************************************************************/

 /**

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/RampDownImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/RampDownImpl.java
index c31f2f5..015de0b 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/RampDownImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/RampDownImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/StuckAtFixedImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/StuckAtFixedImpl.java
index c5f700c..e79385c 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/StuckAtFixedImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/StuckAtFixedImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/StuckAtImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/StuckAtImpl.java
index 9df2706..4dca17b 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/StuckAtImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/StuckAtImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/ThreatStateImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/ThreatStateImpl.java
index 5f6eb06..5b0f8e7 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/ThreatStateImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/ThreatStateImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/ThreatsPropagationFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/ThreatsPropagationFactoryImpl.java
index 5cb78c1..beb7cfd 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/ThreatsPropagationFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/ThreatsPropagationFactoryImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/ThreatsPropagationPackageImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/ThreatsPropagationPackageImpl.java
index df4ae06..5e0383d 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/ThreatsPropagationPackageImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/impl/ThreatsPropagationPackageImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/util/ThreatsPropagationAdapterFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/util/ThreatsPropagationAdapterFactory.java
index 8388ad1..c4175ec 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/util/ThreatsPropagationAdapterFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/util/ThreatsPropagationAdapterFactory.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/util/ThreatsPropagationResourceFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/util/ThreatsPropagationResourceFactoryImpl.java
index 6fde6aa..f606287 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/util/ThreatsPropagationResourceFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/util/ThreatsPropagationResourceFactoryImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/util/ThreatsPropagationResourceImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/util/ThreatsPropagationResourceImpl.java
index f677929..97626f4 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/util/ThreatsPropagationResourceImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/util/ThreatsPropagationResourceImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/util/ThreatsPropagationSwitch.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/util/ThreatsPropagationSwitch.java
index 06898db..e0d00c9 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/util/ThreatsPropagationSwitch.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/util/ThreatsPropagationSwitch.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/util/ThreatsPropagationXMLProcessor.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/util/ThreatsPropagationXMLProcessor.java
index c0d7363..c6538c6 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/util/ThreatsPropagationXMLProcessor.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Dependability/ThreatsPropagation/util/ThreatsPropagationXMLProcessor.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/CH_HwBus.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/CH_HwBus.java
index 50d01ec..d2031ec 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/CH_HwBus.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/CH_HwBus.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/CH_HwComputingResource.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/CH_HwComputingResource.java
index bb78918..01d88f0 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/CH_HwComputingResource.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/CH_HwComputingResource.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/CH_HwProcessor.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/CH_HwProcessor.java
index f43470e..8cab71f 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/CH_HwProcessor.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/CH_HwProcessor.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/HardwareBaselineFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/HardwareBaselineFactory.java
index b831de4..de6e4bb 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/HardwareBaselineFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/HardwareBaselineFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/HardwareBaselinePackage.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/HardwareBaselinePackage.java
index b4c8f75..4b63ddf 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/HardwareBaselinePackage.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/HardwareBaselinePackage.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/impl/CH_HwBusImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/impl/CH_HwBusImpl.java
index aa00a4c..8e997a4 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/impl/CH_HwBusImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/impl/CH_HwBusImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/impl/CH_HwComputingResourceImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/impl/CH_HwComputingResourceImpl.java
index 156663e..a571f10 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/impl/CH_HwComputingResourceImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/impl/CH_HwComputingResourceImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/impl/CH_HwProcessorImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/impl/CH_HwProcessorImpl.java
index 0722f63..6524602 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/impl/CH_HwProcessorImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/impl/CH_HwProcessorImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/impl/HardwareBaselineFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/impl/HardwareBaselineFactoryImpl.java
index 7d8fc7b..feedacb 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/impl/HardwareBaselineFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/impl/HardwareBaselineFactoryImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/impl/HardwareBaselinePackageImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/impl/HardwareBaselinePackageImpl.java
index 7e79510..4208b79 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/impl/HardwareBaselinePackageImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/impl/HardwareBaselinePackageImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/util/HardwareBaselineAdapterFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/util/HardwareBaselineAdapterFactory.java
index f680fb8..859301a 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/util/HardwareBaselineAdapterFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/util/HardwareBaselineAdapterFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/util/HardwareBaselineResourceFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/util/HardwareBaselineResourceFactoryImpl.java
index 36f89c4..087ea33 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/util/HardwareBaselineResourceFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/util/HardwareBaselineResourceFactoryImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/util/HardwareBaselineResourceImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/util/HardwareBaselineResourceImpl.java
index 95f02d9..e2da9a5 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/util/HardwareBaselineResourceImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/util/HardwareBaselineResourceImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/util/HardwareBaselineSwitch.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/util/HardwareBaselineSwitch.java
index a985888..e7ec26c 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/util/HardwareBaselineSwitch.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/util/HardwareBaselineSwitch.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/util/HardwareBaselineXMLProcessor.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/util/HardwareBaselineXMLProcessor.java
index eceb536..204b211 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/util/HardwareBaselineXMLProcessor.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/DeploymentConfiguration/HardwareBaseline/util/HardwareBaselineXMLProcessor.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/CHRtPortSlot.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/CHRtPortSlot.java
index b2c6321..8cb8d66 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/CHRtPortSlot.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/CHRtPortSlot.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/CHRtSpecification.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/CHRtSpecification.java
index e11e9cc..df52add 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/CHRtSpecification.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/CHRtSpecification.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTComponentModelFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTComponentModelFactory.java
index 91d5121..a748676 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTComponentModelFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTComponentModelFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTComponentModelPackage.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTComponentModelPackage.java
index 92da1f0..28e6a88 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTComponentModelPackage.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTComponentModelPackage.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/CH_BurstPattern.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/CH_BurstPattern.java
index d2f1a20..68cec7b 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/CH_BurstPattern.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/CH_BurstPattern.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/CH_PeriodicPattern.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/CH_PeriodicPattern.java
index a7dc082..0638494 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/CH_PeriodicPattern.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/CH_PeriodicPattern.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/CH_SporadicPattern.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/CH_SporadicPattern.java
index d8ce305..d9cef23 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/CH_SporadicPattern.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/CH_SporadicPattern.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/RTDataTypesFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/RTDataTypesFactory.java
index 67ecd42..fa3f7dd 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/RTDataTypesFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/RTDataTypesFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/RTDataTypesPackage.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/RTDataTypesPackage.java
index 53137d9..d178e97 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/RTDataTypesPackage.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/RTDataTypesPackage.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/TA_ArbitraryPattern.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/TA_ArbitraryPattern.java
index be84740..d53aced 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/TA_ArbitraryPattern.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/TA_ArbitraryPattern.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/TA_Pattern.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/TA_Pattern.java
index 351886d..900b6f9 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/TA_Pattern.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/TA_Pattern.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/impl/CH_BurstPatternImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/impl/CH_BurstPatternImpl.java
index 358a40f..164ffd1 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/impl/CH_BurstPatternImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/impl/CH_BurstPatternImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/impl/CH_PeriodicPatternImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/impl/CH_PeriodicPatternImpl.java
index eccd4d1..fe1d4fc 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/impl/CH_PeriodicPatternImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/impl/CH_PeriodicPatternImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/impl/CH_SporadicPatternImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/impl/CH_SporadicPatternImpl.java
index dca5fd1..ecd9727 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/impl/CH_SporadicPatternImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/impl/CH_SporadicPatternImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/impl/RTDataTypesFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/impl/RTDataTypesFactoryImpl.java
index 44403cc..ae19012 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/impl/RTDataTypesFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/impl/RTDataTypesFactoryImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/impl/RTDataTypesPackageImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/impl/RTDataTypesPackageImpl.java
index 7873210..6cab1c3 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/impl/RTDataTypesPackageImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/impl/RTDataTypesPackageImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/impl/TA_ArbitraryPatternImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/impl/TA_ArbitraryPatternImpl.java
index 3ad1ffc..0dc7936 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/impl/TA_ArbitraryPatternImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/impl/TA_ArbitraryPatternImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/impl/TA_PatternImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/impl/TA_PatternImpl.java
index 742e2fb..6f31864 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/impl/TA_PatternImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/impl/TA_PatternImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/util/RTDataTypesAdapterFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/util/RTDataTypesAdapterFactory.java
index a60ed2a..62e8f5a 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/util/RTDataTypesAdapterFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/util/RTDataTypesAdapterFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/util/RTDataTypesSwitch.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/util/RTDataTypesSwitch.java
index 3d9d128..c332bf5 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/util/RTDataTypesSwitch.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/RTDataTypes/util/RTDataTypesSwitch.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/impl/CHRtPortSlotImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/impl/CHRtPortSlotImpl.java
index 0c17124..f7d7fb6 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/impl/CHRtPortSlotImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/impl/CHRtPortSlotImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/impl/CHRtSpecificationImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/impl/CHRtSpecificationImpl.java
index b9dd3a6..2508c32 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/impl/CHRtSpecificationImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/impl/CHRtSpecificationImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/impl/RTComponentModelFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/impl/RTComponentModelFactoryImpl.java
index 04d071e..ff3c5db 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/impl/RTComponentModelFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/impl/RTComponentModelFactoryImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/impl/RTComponentModelPackageImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/impl/RTComponentModelPackageImpl.java
index 2813ac6..f1d7b70 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/impl/RTComponentModelPackageImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/impl/RTComponentModelPackageImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/util/RTComponentModelAdapterFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/util/RTComponentModelAdapterFactory.java
index 63e9fc3..acde2ad 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/util/RTComponentModelAdapterFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/util/RTComponentModelAdapterFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/util/RTComponentModelResourceFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/util/RTComponentModelResourceFactoryImpl.java
index fef8838..d4a6c15 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/util/RTComponentModelResourceFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/util/RTComponentModelResourceFactoryImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/util/RTComponentModelResourceImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/util/RTComponentModelResourceImpl.java
index e31483d..3f90ea1 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/util/RTComponentModelResourceImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/util/RTComponentModelResourceImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/util/RTComponentModelSwitch.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/util/RTComponentModelSwitch.java
index 15bae31..3483f44 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/util/RTComponentModelSwitch.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/util/RTComponentModelSwitch.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/util/RTComponentModelXMLProcessor.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/util/RTComponentModelXMLProcessor.java
index d399e05..006e506 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/util/RTComponentModelXMLProcessor.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Predictability/RTComponentModel/util/RTComponentModelXMLProcessor.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/CriticalityInterfaceSpecification.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/CriticalityInterfaceSpecification.java
index 17fafa2..ad0359f 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/CriticalityInterfaceSpecification.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/CriticalityInterfaceSpecification.java
@@ -3,9 +3,9 @@
  *  *

  *  *    

  *  * All rights reserved. This program and the accompanying materials

- *  * are made available under the terms of the Eclipse Public License v1.0

+ *  * are made available under the terms of the Eclipse Public License v2.0

  *  * which accompanies this distribution, and is available at

- *  * http://www.eclipse.org/legal/epl-v10.html

+ *  * http://www.eclipse.org/legal/epl-v20.html

  *  *

  *******************************************************************************/

 /**

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/CriticalityLevel.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/CriticalityLevel.java
index 978ca92..2b1e98e 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/CriticalityLevel.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/CriticalityLevel.java
@@ -3,9 +3,9 @@
  *  *

  *  *    

  *  * All rights reserved. This program and the accompanying materials

- *  * are made available under the terms of the Eclipse Public License v1.0

+ *  * are made available under the terms of the Eclipse Public License v2.0

  *  * which accompanies this distribution, and is available at

- *  * http://www.eclipse.org/legal/epl-v10.html

+ *  * http://www.eclipse.org/legal/epl-v20.html

  *  *

  *******************************************************************************/

 /**

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/CriticalitySpecification.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/CriticalitySpecification.java
index 5b4f616..ddd60e9 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/CriticalitySpecification.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/CriticalitySpecification.java
@@ -3,9 +3,9 @@
  *  *

  *  *    

  *  * All rights reserved. This program and the accompanying materials

- *  * are made available under the terms of the Eclipse Public License v1.0

+ *  * are made available under the terms of the Eclipse Public License v2.0

  *  * which accompanies this distribution, and is available at

- *  * http://www.eclipse.org/legal/epl-v10.html

+ *  * http://www.eclipse.org/legal/epl-v20.html

  *  *

  *******************************************************************************/

 /**

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/SafetyFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/SafetyFactory.java
index fcd2232..26dbfde 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/SafetyFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/SafetyFactory.java
@@ -3,9 +3,9 @@
  *  *

  *  *    

  *  * All rights reserved. This program and the accompanying materials

- *  * are made available under the terms of the Eclipse Public License v1.0

+ *  * are made available under the terms of the Eclipse Public License v2.0

  *  * which accompanies this distribution, and is available at

- *  * http://www.eclipse.org/legal/epl-v10.html

+ *  * http://www.eclipse.org/legal/epl-v20.html

  *  *

  *******************************************************************************/

 /**

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/SafetyPackage.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/SafetyPackage.java
index f5888ef..cd2580b 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/SafetyPackage.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/SafetyPackage.java
@@ -3,9 +3,9 @@
  *  *

  *  *    

  *  * All rights reserved. This program and the accompanying materials

- *  * are made available under the terms of the Eclipse Public License v1.0

+ *  * are made available under the terms of the Eclipse Public License v2.0

  *  * which accompanies this distribution, and is available at

- *  * http://www.eclipse.org/legal/epl-v10.html

+ *  * http://www.eclipse.org/legal/epl-v20.html

  *  *

  *******************************************************************************/

 /**

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/impl/CriticalityInterfaceSpecificationImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/impl/CriticalityInterfaceSpecificationImpl.java
index a6b76cd..3bba6ef 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/impl/CriticalityInterfaceSpecificationImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/impl/CriticalityInterfaceSpecificationImpl.java
@@ -3,9 +3,9 @@
  *  *

  *  *    

  *  * All rights reserved. This program and the accompanying materials

- *  * are made available under the terms of the Eclipse Public License v1.0

+ *  * are made available under the terms of the Eclipse Public License v2.0

  *  * which accompanies this distribution, and is available at

- *  * http://www.eclipse.org/legal/epl-v10.html

+ *  * http://www.eclipse.org/legal/epl-v20.html

  *  *

  *******************************************************************************/

 /**

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/impl/CriticalityLevelImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/impl/CriticalityLevelImpl.java
index 4387fef..4ff7db9 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/impl/CriticalityLevelImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/impl/CriticalityLevelImpl.java
@@ -3,9 +3,9 @@
  *  *

  *  *    

  *  * All rights reserved. This program and the accompanying materials

- *  * are made available under the terms of the Eclipse Public License v1.0

+ *  * are made available under the terms of the Eclipse Public License v2.0

  *  * which accompanies this distribution, and is available at

- *  * http://www.eclipse.org/legal/epl-v10.html

+ *  * http://www.eclipse.org/legal/epl-v20.html

  *  *

  *******************************************************************************/

 /**

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/impl/CriticalitySpecificationImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/impl/CriticalitySpecificationImpl.java
index 4b3cff7..87a9f2e 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/impl/CriticalitySpecificationImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/impl/CriticalitySpecificationImpl.java
@@ -3,9 +3,9 @@
  *  *

  *  *    

  *  * All rights reserved. This program and the accompanying materials

- *  * are made available under the terms of the Eclipse Public License v1.0

+ *  * are made available under the terms of the Eclipse Public License v2.0

  *  * which accompanies this distribution, and is available at

- *  * http://www.eclipse.org/legal/epl-v10.html

+ *  * http://www.eclipse.org/legal/epl-v20.html

  *  *

  *******************************************************************************/

 /**

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/impl/SafetyFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/impl/SafetyFactoryImpl.java
index 90ab0ad..79ae83c 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/impl/SafetyFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/impl/SafetyFactoryImpl.java
@@ -3,9 +3,9 @@
  *  *

  *  *    

  *  * All rights reserved. This program and the accompanying materials

- *  * are made available under the terms of the Eclipse Public License v1.0

+ *  * are made available under the terms of the Eclipse Public License v2.0

  *  * which accompanies this distribution, and is available at

- *  * http://www.eclipse.org/legal/epl-v10.html

+ *  * http://www.eclipse.org/legal/epl-v20.html

  *  *

  *******************************************************************************/

 /**

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/impl/SafetyPackageImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/impl/SafetyPackageImpl.java
index fa294a6..28e5d09 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/impl/SafetyPackageImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/impl/SafetyPackageImpl.java
@@ -3,9 +3,9 @@
  *  *

  *  *    

  *  * All rights reserved. This program and the accompanying materials

- *  * are made available under the terms of the Eclipse Public License v1.0

+ *  * are made available under the terms of the Eclipse Public License v2.0

  *  * which accompanies this distribution, and is available at

- *  * http://www.eclipse.org/legal/epl-v10.html

+ *  * http://www.eclipse.org/legal/epl-v20.html

  *  *

  *******************************************************************************/

 /**

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/util/SafetyAdapterFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/util/SafetyAdapterFactory.java
index eaf4f40..7e1e00c 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/util/SafetyAdapterFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/util/SafetyAdapterFactory.java
@@ -3,9 +3,9 @@
  *  *

  *  *    

  *  * All rights reserved. This program and the accompanying materials

- *  * are made available under the terms of the Eclipse Public License v1.0

+ *  * are made available under the terms of the Eclipse Public License v2.0

  *  * which accompanies this distribution, and is available at

- *  * http://www.eclipse.org/legal/epl-v10.html

+ *  * http://www.eclipse.org/legal/epl-v20.html

  *  *

  *******************************************************************************/

 /**

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/util/SafetySwitch.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/util/SafetySwitch.java
index 04b3bd2..fbc97ac 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/util/SafetySwitch.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/Safety/util/SafetySwitch.java
@@ -3,9 +3,9 @@
  *  *

  *  *    

  *  * All rights reserved. This program and the accompanying materials

- *  * are made available under the terms of the Eclipse Public License v1.0

+ *  * are made available under the terms of the Eclipse Public License v2.0

  *  * which accompanies this distribution, and is available at

- *  * http://www.eclipse.org/legal/epl-v10.html

+ *  * http://www.eclipse.org/legal/epl-v20.html

  *  *

  *******************************************************************************/

 /**

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/Human.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/Human.java
index 5ac2f0f..09f2595 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/Human.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/Human.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/STSFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/STSFactory.java
index 20c3612..9a19d8f 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/STSFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/STSFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/STSPackage.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/STSPackage.java
index c971d64..b15f80f 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/STSPackage.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/STSPackage.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/Technological.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/Technological.java
index 98531b3..25ed96b 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/Technological.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/Technological.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/TimePressure.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/TimePressure.java
index 01fb854..b225e9c 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/TimePressure.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/TimePressure.java
@@ -3,9 +3,9 @@
  *  *
  *  *    
  *  * All rights reserved. This program and the accompanying materials
- *  * are made available under the terms of the Eclipse Public License v1.0
+ *  * are made available under the terms of the Eclipse Public License v2.0
  *  * which accompanies this distribution, and is available at
- *  * http://www.eclipse.org/legal/epl-v10.html
+ *  * http://www.eclipse.org/legal/epl-v20.html
  *  *
  *******************************************************************************/
 /**
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/impl/HumanImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/impl/HumanImpl.java
index 34258ef..8b2e930 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/impl/HumanImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/impl/HumanImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/impl/STSFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/impl/STSFactoryImpl.java
index d4a642a..62af9b2 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/impl/STSFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/impl/STSFactoryImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/impl/STSPackageImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/impl/STSPackageImpl.java
index 0720c86..817f7ec 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/impl/STSPackageImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/impl/STSPackageImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/impl/TechnologicalImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/impl/TechnologicalImpl.java
index 22f8f81..1d7dad8 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/impl/TechnologicalImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/impl/TechnologicalImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/impl/TimePressureImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/impl/TimePressureImpl.java
index c90618f..e26be0b 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/impl/TimePressureImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/impl/TimePressureImpl.java
@@ -3,9 +3,9 @@
  *  *

  *  *    

  *  * All rights reserved. This program and the accompanying materials

- *  * are made available under the terms of the Eclipse Public License v1.0

+ *  * are made available under the terms of the Eclipse Public License v2.0

  *  * which accompanies this distribution, and is available at

- *  * http://www.eclipse.org/legal/epl-v10.html

+ *  * http://www.eclipse.org/legal/epl-v20.html

  *  *

  *******************************************************************************/

 /**

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/util/STSAdapterFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/util/STSAdapterFactory.java
index 2a3538b..d069f9c 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/util/STSAdapterFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/util/STSAdapterFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/util/STSSwitch.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/util/STSSwitch.java
index 59f9c08..2ed6e54 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/util/STSSwitch.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/SystemModel/STS/util/STSSwitch.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/chessmlprofileFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/chessmlprofileFactory.java
index a0a6dab..65db7db 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/chessmlprofileFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/chessmlprofileFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/chessmlprofilePackage.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/chessmlprofilePackage.java
index 8df6045..dc21298 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/chessmlprofilePackage.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/chessmlprofilePackage.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/dummy.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/dummy.java
index aa5cd9d..1e881c4 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/dummy.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/dummy.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/impl/chessmlprofileFactoryImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/impl/chessmlprofileFactoryImpl.java
index dabc86d..9f1de20 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/impl/chessmlprofileFactoryImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/impl/chessmlprofileFactoryImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/impl/chessmlprofilePackageImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/impl/chessmlprofilePackageImpl.java
index 03d94ce..e02cbd7 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/impl/chessmlprofilePackageImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/impl/chessmlprofilePackageImpl.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/impl/dummyImpl.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/impl/dummyImpl.java
index 27bfd9c..fe8e93d 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/impl/dummyImpl.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/impl/dummyImpl.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/util/Constants.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/util/Constants.java
index 91df6a7..0e5bec8 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/util/Constants.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/util/Constants.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/util/chessmlprofileAdapterFactory.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/util/chessmlprofileAdapterFactory.java
index ee93a34..de3a22e 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/util/chessmlprofileAdapterFactory.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/util/chessmlprofileAdapterFactory.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  *
  *****************************************************************************/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/util/chessmlprofileSwitch.java b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/util/chessmlprofileSwitch.java
index 3a82459..67af005 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/util/chessmlprofileSwitch.java
+++ b/plugins/org.polarsys.chess.chessmlprofile/src/org/polarsys/chess/chessmlprofile/util/chessmlprofileSwitch.java
@@ -3,9 +3,9 @@
  *

  *    

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *

  *

  *****************************************************************************/

diff --git a/plugins/org.polarsys.chess.cleanCExporter/about.html b/plugins/org.polarsys.chess.cleanCExporter/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/plugins/org.polarsys.chess.cleanCExporter/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.cleanCExporter/src/org/polarsys/chess/cleanCExporter/ui/commands/ExportNominalSMsToCleanCFilesCommand.java b/plugins/org.polarsys.chess.cleanCExporter/src/org/polarsys/chess/cleanCExporter/ui/commands/ExportNominalSMsToCleanCFilesCommand.java
index f4fb651..cff8216 100644
--- a/plugins/org.polarsys.chess.cleanCExporter/src/org/polarsys/chess/cleanCExporter/ui/commands/ExportNominalSMsToCleanCFilesCommand.java
+++ b/plugins/org.polarsys.chess.cleanCExporter/src/org/polarsys/chess/cleanCExporter/ui/commands/ExportNominalSMsToCleanCFilesCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *  

  * Contributors:

  *   Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.cleanCExporter/src/org/polarsys/chess/cleanCExporter/ui/commands/ExportSelectedNominalSMsToCleanCFilesCommand.java b/plugins/org.polarsys.chess.cleanCExporter/src/org/polarsys/chess/cleanCExporter/ui/commands/ExportSelectedNominalSMsToCleanCFilesCommand.java
index eba31a8..fa35104 100644
--- a/plugins/org.polarsys.chess.cleanCExporter/src/org/polarsys/chess/cleanCExporter/ui/commands/ExportSelectedNominalSMsToCleanCFilesCommand.java
+++ b/plugins/org.polarsys.chess.cleanCExporter/src/org/polarsys/chess/cleanCExporter/ui/commands/ExportSelectedNominalSMsToCleanCFilesCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *  

  * Contributors:

  *   Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.cleanCExporter/src/org/polarsys/chess/cleanCExporter/ui/services/CleanCExportServiceUI.java b/plugins/org.polarsys.chess.cleanCExporter/src/org/polarsys/chess/cleanCExporter/ui/services/CleanCExportServiceUI.java
index 7242af6..eaf288c 100644
--- a/plugins/org.polarsys.chess.cleanCExporter/src/org/polarsys/chess/cleanCExporter/ui/services/CleanCExportServiceUI.java
+++ b/plugins/org.polarsys.chess.cleanCExporter/src/org/polarsys/chess/cleanCExporter/ui/services/CleanCExportServiceUI.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *  

  * Contributors:

  *   Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.codegen.ada/about.html b/plugins/org.polarsys.chess.codegen.ada/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/plugins/org.polarsys.chess.codegen.ada/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.codegen.ada/build.properties b/plugins/org.polarsys.chess.codegen.ada/build.properties
index 4adc4f6..58266cc 100644
--- a/plugins/org.polarsys.chess.codegen.ada/build.properties
+++ b/plugins/org.polarsys.chess.codegen.ada/build.properties
@@ -3,9 +3,9 @@
 #  *
 #  *    
 #  * All rights reserved. This program and the accompanying materials
-#  * are made available under the terms of the Eclipse Public License v1.0
+#  * are made available under the terms of the Eclipse Public License v2.0
 #  * which accompanies this distribution, and is available at
-#  * http://www.eclipse.org/legal/epl-v10.html
+#  * http://www.eclipse.org/legal/epl-v20.html
 #  *
 ###############################################################################
 source.. = src/
diff --git a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/cpa/container_protection.adb b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/cpa/container_protection.adb
index acee0bc..23792b5 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/cpa/container_protection.adb
+++ b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/cpa/container_protection.adb
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 
 
diff --git a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/cpa/container_protection.ads b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/cpa/container_protection.ads
index 25d352b..5f2c5b9 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/cpa/container_protection.ads
+++ b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/cpa/container_protection.ads
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 
 with System;
diff --git a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/dataStructure/data_structure.adb b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/dataStructure/data_structure.adb
index 3a2a488..4257939 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/dataStructure/data_structure.adb
+++ b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/dataStructure/data_structure.adb
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 
 --with Ada.Text_IO; use Ada.Text_IO;
diff --git a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/dataStructure/data_structure.ads b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/dataStructure/data_structure.ads
index 812c0f0..b097935 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/dataStructure/data_structure.ads
+++ b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/dataStructure/data_structure.ads
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 
 
diff --git a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/dataStructure/system_time.ads b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/dataStructure/system_time.ads
index 3b34c42..bec8d9f 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/dataStructure/system_time.ads
+++ b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/dataStructure/system_time.ads
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 
 with Ada.Real_Time;
diff --git a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/dataStructure/system_types.adb b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/dataStructure/system_types.adb
index 3f58e1b..7a5f3c0 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/dataStructure/system_types.adb
+++ b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/dataStructure/system_types.adb
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 
 package body System_Types is
diff --git a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/dataStructure/system_types.ads b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/dataStructure/system_types.ads
index bca09cc..68c24f6 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/dataStructure/system_types.ads
+++ b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/dataStructure/system_types.ads
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 
 
diff --git a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/dataStructure/task_attributes.ads b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/dataStructure/task_attributes.ads
index aa06b9c..ac9f7bc 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/dataStructure/task_attributes.ads
+++ b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/dataStructure/task_attributes.ads
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 
 
diff --git a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task.adb b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task.adb
index 3fa1abc..b167b00 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task.adb
+++ b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task.adb
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 
 with System_Time;
diff --git a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task.ads b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task.ads
index a1b734c..721888e 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task.ads
+++ b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task.ads
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 
 
diff --git a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task_monitored.adb b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task_monitored.adb
index d6e53a1..47661df 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task_monitored.adb
+++ b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task_monitored.adb
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 
 with System_Time;
diff --git a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task_monitored.ads b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task_monitored.ads
index 3627d1a..5c0b8af 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task_monitored.ads
+++ b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task_monitored.ads
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 
 
diff --git a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task_monitored_rtverification.adb b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task_monitored_rtverification.adb
index a833bcc..e8e3fcd 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task_monitored_rtverification.adb
+++ b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task_monitored_rtverification.adb
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 
 with System_Time;
diff --git a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task_monitored_rtverification.ads b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task_monitored_rtverification.ads
index 363a358..5885a30 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task_monitored_rtverification.ads
+++ b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task_monitored_rtverification.ads
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 
 
diff --git a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task_rtverification.adb b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task_rtverification.adb
index e758939..b88768e 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task_rtverification.adb
+++ b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task_rtverification.adb
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 
 with System_Time;
diff --git a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task_rtverification.ads b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task_rtverification.ads
index 559360a..44d44c4 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task_rtverification.ads
+++ b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/cyclic_task_rtverification.ads
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 
 
diff --git a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/middleware/remote_msg_server_task.adb b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/middleware/remote_msg_server_task.adb
index 5e2021d..05f15ee 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/middleware/remote_msg_server_task.adb
+++ b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/middleware/remote_msg_server_task.adb
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 
 with System_Time;
diff --git a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/middleware/remote_msg_server_task.ads b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/middleware/remote_msg_server_task.ads
index 1134afe..a839b41 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/middleware/remote_msg_server_task.ads
+++ b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/middleware/remote_msg_server_task.ads
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 
 with System;
diff --git a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/multi_activity_cyclic_task.adb b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/multi_activity_cyclic_task.adb
index f88a4f1..f97304f 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/multi_activity_cyclic_task.adb
+++ b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/multi_activity_cyclic_task.adb
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 
 with System_Time;
diff --git a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/multi_activity_cyclic_task.ads b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/multi_activity_cyclic_task.ads
index 7368bdc..91401d2 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/multi_activity_cyclic_task.ads
+++ b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/multi_activity_cyclic_task.ads
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 
 with System;
diff --git a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/sporadic_task.adb b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/sporadic_task.adb
index e917192..cafc5c3 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/sporadic_task.adb
+++ b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/sporadic_task.adb
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 
 with System_Time;
diff --git a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/sporadic_task.ads b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/sporadic_task.ads
index 19e5990..c5c70bd 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/sporadic_task.ads
+++ b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/sporadic_task.ads
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 
 with System;
diff --git a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/sporadic_task_monitored.adb b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/sporadic_task_monitored.adb
index 8b572be..fde84ff 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/sporadic_task_monitored.adb
+++ b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/sporadic_task_monitored.adb
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 
 with System_Time;
diff --git a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/sporadic_task_monitored.ads b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/sporadic_task_monitored.ads
index 22690e9..2a12e39 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/sporadic_task_monitored.ads
+++ b/plugins/org.polarsys.chess.codegen.ada/src-lib/src/task/sporadic_task_monitored.ads
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 
 with System;
diff --git a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/Activator.java b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/Activator.java
index e8c6398..b4bb80c 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/Activator.java
+++ b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/Activator.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *  Alessandro Zovi
diff --git a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/component/ComponentImplementation.mtl b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/component/ComponentImplementation.mtl
index bd9e9a0..7fe3d8e 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/component/ComponentImplementation.mtl
+++ b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/component/ComponentImplementation.mtl
@@ -12,7 +12,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 /]
 [module ComponentImplementation('http://www.eclipse.org/uml2/3.0.0/UML')/]
diff --git a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/component/ComponentImplementationAda.mtl b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/component/ComponentImplementationAda.mtl
index 2ff5bca..70e5207 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/component/ComponentImplementationAda.mtl
+++ b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/component/ComponentImplementationAda.mtl
@@ -12,7 +12,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 /]
 [module ComponentImplementationAda('http://www.eclipse.org/uml2/3.0.0/UML')/]
diff --git a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/component/ComponentImplementationC.mtl b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/component/ComponentImplementationC.mtl
index 6de548a..d27c54c 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/component/ComponentImplementationC.mtl
+++ b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/component/ComponentImplementationC.mtl
@@ -12,7 +12,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 /]
 [module ComponentImplementationC('http://www.eclipse.org/uml2/3.0.0/UML')/]
diff --git a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/component/ComponentType.mtl b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/component/ComponentType.mtl
index 8aa9c96..beb5bd4 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/component/ComponentType.mtl
+++ b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/component/ComponentType.mtl
@@ -12,7 +12,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 /]
 [module ComponentType('http://www.eclipse.org/uml2/3.0.0/UML', 'http://www.eclipse.org/papyrus/GCM/1')]
diff --git a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/container/Container.mtl b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/container/Container.mtl
index 791c635..842a2b5 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/container/Container.mtl
+++ b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/container/Container.mtl
@@ -12,7 +12,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 /]
 [module Container('http://www.eclipse.org/uml2/3.0.0/UML',
diff --git a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/datatype/DataType.mtl b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/datatype/DataType.mtl
index 8fc3261..f40a34f 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/datatype/DataType.mtl
+++ b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/datatype/DataType.mtl
@@ -12,7 +12,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 /]
 [module DataType('http://www.eclipse.org/uml2/3.0.0/UML')]
diff --git a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/datatype/DataTypeC.mtl b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/datatype/DataTypeC.mtl
index 3f35818..227ef10 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/datatype/DataTypeC.mtl
+++ b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/datatype/DataTypeC.mtl
@@ -12,7 +12,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 /]
 [module DataTypeC('http://www.eclipse.org/uml2/3.0.0/UML')]
diff --git a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/deployment/Deployment.mtl b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/deployment/Deployment.mtl
index d15d606..fe713c0 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/deployment/Deployment.mtl
+++ b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/deployment/Deployment.mtl
@@ -12,7 +12,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 /]
 [module Deployment('http://www.eclipse.org/uml2/3.0.0/UML', 'http://www.eclipse.org/papyrus/GCM/1')]
diff --git a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/handlers/AdaGenUIHandler.java b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/handlers/AdaGenUIHandler.java
index 80363b3..c12d619 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/handlers/AdaGenUIHandler.java
+++ b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/handlers/AdaGenUIHandler.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *  Alessandro Zovi
diff --git a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/ifs/Interface.mtl b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/ifs/Interface.mtl
index 33de90f..2694c50 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/ifs/Interface.mtl
+++ b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/ifs/Interface.mtl
@@ -12,7 +12,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 /]
 [module Interface('http://www.eclipse.org/uml2/3.0.0/UML')]
diff --git a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/Copyright.mtl b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/Copyright.mtl
index d46307d..faaf585 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/Copyright.mtl
+++ b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/Copyright.mtl
@@ -12,7 +12,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 /]
 [module Copyright('http://www.eclipse.org/uml2/3.0.0/UML')]
@@ -32,7 +32,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 [/template]
 
@@ -51,7 +51,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 [/template]
 
@@ -103,7 +103,7 @@
 # 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                          #
+# http://www.eclipse.org/legal/epl-v20.html                          #
 #                                                                    #
 ######################################################################
 [/template]
diff --git a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/GNATadc.mtl b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/GNATadc.mtl
index e8c5e53..7641f80 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/GNATadc.mtl
+++ b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/GNATadc.mtl
@@ -12,7 +12,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 /]
 [module GNATadc('http://www.eclipse.org/uml2/3.0.0/UML')]
diff --git a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/GPR.mtl b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/GPR.mtl
index 7903f6f..4baaa16 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/GPR.mtl
+++ b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/GPR.mtl
@@ -12,7 +12,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 /]
 [module GPR('http://www.eclipse.org/uml2/3.0.0/UML')]
diff --git a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/GenerateInfrastructure.java b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/GenerateInfrastructure.java
index 99f41df..0d14e1f 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/GenerateInfrastructure.java
+++ b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/GenerateInfrastructure.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2015 Obeo.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     Obeo - initial API and implementation
@@ -341,9 +341,6 @@
     @Override
     public void registerPackages(ResourceSet resourceSet) {
         super.registerPackages(resourceSet);
-        if (!isInWorkspace(org.eclipse.uml2.uml.UMLPackage.class)) {
-            resourceSet.getPackageRegistry().put(org.eclipse.uml2.uml.UMLPackage.eINSTANCE.getNsURI(), org.eclipse.uml2.uml.UMLPackage.eINSTANCE);
-        }
         
         /*
          * If you want to change the content of this method, do NOT forget to change the "@generated"
diff --git a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/License.mtl b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/License.mtl
index e7f446c..d8fb595 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/License.mtl
+++ b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/License.mtl
@@ -12,7 +12,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 /]
 [module License('http://www.eclipse.org/uml2/3.0.0/UML')]
diff --git a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/Main.mtl b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/Main.mtl
index ccd255a..c27ffed 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/Main.mtl
+++ b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/Main.mtl
@@ -12,7 +12,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 /]
 [module Main('http://www.eclipse.org/uml2/3.0.0/UML')]
diff --git a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/generateInfrastructure.mtl b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/generateInfrastructure.mtl
index 8fc21a1..d3610f2 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/generateInfrastructure.mtl
+++ b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/generateInfrastructure.mtl
@@ -12,7 +12,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 /]
 [module generateInfrastructure('http://www.eclipse.org/uml2/3.0.0/UML')]
diff --git a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/middleware/CRClib.mtl b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/middleware/CRClib.mtl
index 8b1fdcb..e377b6b 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/middleware/CRClib.mtl
+++ b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/middleware/CRClib.mtl
@@ -12,7 +12,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 /]
 [module CRClib('http://www.eclipse.org/uml2/3.0.0/UML')]
diff --git a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/middleware/DistributionNamingData.mtl b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/middleware/DistributionNamingData.mtl
index 281df5a..08adeb8 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/middleware/DistributionNamingData.mtl
+++ b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/middleware/DistributionNamingData.mtl
@@ -12,7 +12,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 /]
 [module DistributionNamingData('http://www.eclipse.org/uml2/3.0.0/UML', 'http://www.eclipse.org/papyrus/GCM/1')]
diff --git a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/middleware/MiddlewareRealTimeAttribute.mtl b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/middleware/MiddlewareRealTimeAttribute.mtl
index 9eae2f8..8f047b3 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/middleware/MiddlewareRealTimeAttribute.mtl
+++ b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/middleware/MiddlewareRealTimeAttribute.mtl
@@ -12,7 +12,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 /]
 [module MiddlewareRealTimeAttribute('http://www.eclipse.org/uml2/3.0.0/UML', 'http://www.eclipse.org/papyrus/GCM/1')]
diff --git a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/middleware/RemoteMsgClient.mtl b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/middleware/RemoteMsgClient.mtl
index 0e07cee..7f5bcf2 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/middleware/RemoteMsgClient.mtl
+++ b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/middleware/RemoteMsgClient.mtl
@@ -12,7 +12,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 /]
 [module RemoteMsgClient('http://www.eclipse.org/uml2/3.0.0/UML', 'http://www.eclipse.org/papyrus/GCM/1')]
diff --git a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/middleware/RemoteMsgServer.mtl b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/middleware/RemoteMsgServer.mtl
index 8294696..e2f46d5 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/middleware/RemoteMsgServer.mtl
+++ b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/middleware/RemoteMsgServer.mtl
@@ -12,7 +12,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 /]
 [module RemoteMsgServer('http://www.eclipse.org/uml2/3.0.0/UML', 'http://www.eclipse.org/papyrus/GCM/1')]
diff --git a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/service/UML2Service.java b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/service/UML2Service.java
index 9b14747..586f71a 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/service/UML2Service.java
+++ b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/service/UML2Service.java
@@ -11,7 +11,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 
diff --git a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/transformations/AcceleoCodeGen.java b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/transformations/AcceleoCodeGen.java
index 264e0a0..ebf5c46 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/transformations/AcceleoCodeGen.java
+++ b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/transformations/AcceleoCodeGen.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *  Alessandro Zovi
diff --git a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/transformations/Transformations.java b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/transformations/Transformations.java
index f4becff..2985b9a 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/transformations/Transformations.java
+++ b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/transformations/Transformations.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *  Alessandro Zovi
diff --git a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/util/AdaGenUtil.java b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/util/AdaGenUtil.java
index d08e7a9..076e4de 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/util/AdaGenUtil.java
+++ b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/util/AdaGenUtil.java
@@ -1,22 +1,29 @@
-package org.polarsys.chess.codegen.ada.util;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-
-public class AdaGenUtil {
-	
-	/**
-	 * Utility method to get the active Eclipse project.
-	 *
-	 * @param editor the editor
-	 * @return the active project
-	 */
-	public static IProject getActiveProject(IEditorPart editor) {
-		IFileEditorInput input = (IFileEditorInput) editor.getEditorInput();
-		IFile file = input.getFile();
-		return file.getProject();
-	}
-
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+package org.polarsys.chess.codegen.ada.util;

+

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IProject;

+import org.eclipse.ui.IEditorPart;

+import org.eclipse.ui.IFileEditorInput;

+

+public class AdaGenUtil {

+	

+	/**

+	 * Utility method to get the active Eclipse project.

+	 *

+	 * @param editor the editor

+	 * @return the active project

+	 */

+	public static IProject getActiveProject(IEditorPart editor) {

+		IFileEditorInput input = (IFileEditorInput) editor.getEditorInput();

+		IFile file = input.getFile();

+		return file.getProject();

+	}

+

+}

diff --git a/plugins/org.polarsys.chess.codegen.ada/tasks/generateInfrastructure.xml b/plugins/org.polarsys.chess.codegen.ada/tasks/generateInfrastructure.xml
index b6058aa..6427a35 100644
--- a/plugins/org.polarsys.chess.codegen.ada/tasks/generateInfrastructure.xml
+++ b/plugins/org.polarsys.chess.codegen.ada/tasks/generateInfrastructure.xml
@@ -1,49 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project default="generateInfrastructure" name="org.polarsys.chess.codegen.ada">
-<<<<<<< HEAD
-    <property name="ECLIPSE_HOME" value="../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515"/>
-    <property name="ECLIPSE_WORKSPACE" value="../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515/workspace"/>
-=======
-    <property name="ECLIPSE_HOME" value="../../../../../Eclipse/eclipse"/>
-    <property name="ECLIPSE_WORKSPACE" value="../../../../../Workspaces/FirstConfig/ws"/>
->>>>>>> refs/remotes/origin/master
+    <property name="ECLIPSE_HOME" value="../../../../.."/>
+    <property name="ECLIPSE_WORKSPACE" value="../../../../../workspace"/>
 
     <!-- The classpath with only the dependencies used by the project -->
     <path id="org.polarsys.chess.codegen.ada.libraryclasspath">
         <pathelement location="${ECLIPSE_WORKSPACE}/org.polarsys.chess.codegen.ada/bin"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/resources.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/rt.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/jsse.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/jce.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/charsets.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/jfr.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/access-bridge-64.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/cldrdata.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/dnsns.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/jaccess.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/jfxrt.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/localedata.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/nashorn.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunec.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunjce_provider.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunmscapi.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/sunpkcs11.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/jre/lib/ext/zipfs.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/javax.inject_1.0.0.v20091030.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi_3.11.3.v20170209-1843.jar"/>
-<<<<<<< HEAD
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.fx.osgi_2.4.0.201605100504.jar"/>
-=======
->>>>>>> refs/remotes/origin/master
+        <pathelement location="${ECLIPSE_WORKSPACE}//.metadata/.plugins/org.eclipse.pde.core/.bundle_pool/plugins/org.eclipse.equinox.transforms.hook_1.1.0.v20131021-1933.jar"/>
+        <pathelement location="${ECLIPSE_WORKSPACE}//.metadata/.plugins/org.eclipse.pde.core/.bundle_pool/plugins/org.eclipse.equinox.weaving.hook_1.1.200.v20150730-1648.jar"/>
+        <pathelement location="${ECLIPSE_WORKSPACE}//.metadata/.plugins/org.eclipse.pde.core/.bundle_pool/plugins/org.eclipse.equinox.region_1.3.2.v20170118-1930.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar"/>
+        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.wst.jsdt.nashorn.extension_1.0.2.v201610280128.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.registry_3.6.100.v20160223-2218.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.preferences_3.6.1.v20160815-1406.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.contenttype_3.5.100.v20160418-1621.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.uml_5.2.3.v20170227-0935.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore_2.12.0.v20160420-0247.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.common_2.12.0.v20160420-0247.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.xmi_2.12.0.v20160420-0247.jar"/>
@@ -61,15 +37,7 @@
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.engine_3.6.6.201610060831.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen.ecore_2.12.0.v20160526-0356.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar"/>
-<<<<<<< HEAD
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.3.201810170111.jar"/>
-=======
-<<<<<<< HEAD
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.3.201903050251.jar"/>
-=======
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.0.201703081153.jar"/>
->>>>>>> branch 'master' of git@gitlab.fbk.eu:CPS_Design/CHESS.git
->>>>>>> refs/remotes/origin/master
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.commands_3.8.1.v20161221-1651.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.resources_3.11.1.v20161107-2032.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core_2.1.1.201703080851.jar"/>
diff --git a/plugins/org.polarsys.chess.codegen.ada/transformations/monitoring.qvto b/plugins/org.polarsys.chess.codegen.ada/transformations/monitoring.qvto
index 5964c7a..6c108d5 100644
--- a/plugins/org.polarsys.chess.codegen.ada/transformations/monitoring.qvto
+++ b/plugins/org.polarsys.chess.codegen.ada/transformations/monitoring.qvto
@@ -11,7 +11,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.commands/about.html b/plugins/org.polarsys.chess.commands/about.html
index dd3c089..164f781 100644
--- a/plugins/org.polarsys.chess.commands/about.html
+++ b/plugins/org.polarsys.chess.commands/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>November 14, 2008</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/Activator.java b/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/Activator.java
index 1810610..05b0527 100644
--- a/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/Activator.java
+++ b/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/Activator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011 -2014 Intecs.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    Stefano Puri, Nicholas Pacini - initial API and implementation and/or initial documentation
diff --git a/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/AssignCopy.java b/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/AssignCopy.java
index 84842e9..438caff 100644
--- a/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/AssignCopy.java
+++ b/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/AssignCopy.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011 -2014 Intecs.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    Stefano Puri, Nicholas Pacini - initial API and implementation and/or initial documentation
diff --git a/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/BuildModelInstanceCommand.java b/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/BuildModelInstanceCommand.java
index 718748e..e7fed9f 100644
--- a/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/BuildModelInstanceCommand.java
+++ b/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/BuildModelInstanceCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Intecs.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    Intecs
diff --git a/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/HideRTInformationCommand.java b/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/HideRTInformationCommand.java
index c109465..945f8cf 100644
--- a/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/HideRTInformationCommand.java
+++ b/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/HideRTInformationCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011 -2014 Intecs.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    Stefano Puri, Nicholas Pacini - initial API and implementation and/or initial documentation
diff --git a/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/ShowRTInformationCommand.java b/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/ShowRTInformationCommand.java
index d420c0f..a0e3be0 100644
--- a/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/ShowRTInformationCommand.java
+++ b/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/ShowRTInformationCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011 -2014 Intecs.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    Stefano Puri, Nicholas Pacini - initial API and implementation and/or initial documentation
diff --git a/plugins/org.polarsys.chess.constraints.constraintEditor/about.html b/plugins/org.polarsys.chess.constraints.constraintEditor/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/plugins/org.polarsys.chess.constraints.constraintEditor/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.constraints.constraintEditor/src/org/polarsys/chess/constraints/constraintEditor/ConstraintEditorFilter.java b/plugins/org.polarsys.chess.constraints.constraintEditor/src/org/polarsys/chess/constraints/constraintEditor/ConstraintEditorFilter.java
index d6e9ea6..818397e 100644
--- a/plugins/org.polarsys.chess.constraints.constraintEditor/src/org/polarsys/chess/constraints/constraintEditor/ConstraintEditorFilter.java
+++ b/plugins/org.polarsys.chess.constraints.constraintEditor/src/org/polarsys/chess/constraints/constraintEditor/ConstraintEditorFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.constraints.constraintEditor/src/org/polarsys/chess/constraints/constraintEditor/CustomConstraintEditorTab.java b/plugins/org.polarsys.chess.constraints.constraintEditor/src/org/polarsys/chess/constraints/constraintEditor/CustomConstraintEditorTab.java
index 6c7a417..2e742f8 100644
--- a/plugins/org.polarsys.chess.constraints.constraintEditor/src/org/polarsys/chess/constraints/constraintEditor/CustomConstraintEditorTab.java
+++ b/plugins/org.polarsys.chess.constraints.constraintEditor/src/org/polarsys/chess/constraints/constraintEditor/CustomConstraintEditorTab.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.core/about.html b/plugins/org.polarsys.chess.core/about.html
index dd3c089..164f781 100644
--- a/plugins/org.polarsys.chess.core/about.html
+++ b/plugins/org.polarsys.chess.core/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>November 14, 2008</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.core/license/Copyright.txt b/plugins/org.polarsys.chess.core/license/Copyright.txt
index ea34afc..6504a09 100644
--- a/plugins/org.polarsys.chess.core/license/Copyright.txt
+++ b/plugins/org.polarsys.chess.core/license/Copyright.txt
@@ -9,5 +9,5 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
diff --git a/plugins/org.polarsys.chess.core/schema/org.polarsys.chess.diagramListener.exsd b/plugins/org.polarsys.chess.core/schema/org.polarsys.chess.diagramListener.exsd
index 4e94c32..30b2df8 100644
--- a/plugins/org.polarsys.chess.core/schema/org.polarsys.chess.diagramListener.exsd
+++ b/plugins/org.polarsys.chess.core/schema/org.polarsys.chess.diagramListener.exsd
@@ -128,7 +128,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
       </documentation>
    </annotation>
diff --git a/plugins/org.polarsys.chess.core/schema/org.polarsys.chess.resourceListener.exsd b/plugins/org.polarsys.chess.core/schema/org.polarsys.chess.resourceListener.exsd
index 0369cba..06df163 100644
--- a/plugins/org.polarsys.chess.core/schema/org.polarsys.chess.resourceListener.exsd
+++ b/plugins/org.polarsys.chess.core/schema/org.polarsys.chess.resourceListener.exsd
@@ -128,7 +128,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
       </documentation>
    </annotation>
diff --git a/plugins/org.polarsys.chess.core/schema/org.polarsys.chess.selectionListener.exsd b/plugins/org.polarsys.chess.core/schema/org.polarsys.chess.selectionListener.exsd
index a6e3918..ffb96eb 100644
--- a/plugins/org.polarsys.chess.core/schema/org.polarsys.chess.selectionListener.exsd
+++ b/plugins/org.polarsys.chess.core/schema/org.polarsys.chess.selectionListener.exsd
@@ -128,7 +128,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
       </documentation>
    </annotation>
diff --git a/plugins/org.polarsys.chess.core/src/javax/xml/bind/EmptyClass.java b/plugins/org.polarsys.chess.core/src/javax/xml/bind/EmptyClass.java
index 177e5a6..9d5fa1b 100644
--- a/plugins/org.polarsys.chess.core/src/javax/xml/bind/EmptyClass.java
+++ b/plugins/org.polarsys.chess.core/src/javax/xml/bind/EmptyClass.java
@@ -1,3 +1,10 @@
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

 package javax.xml.bind;

 

 public class EmptyClass {

diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/Activator.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/Activator.java
index acf9c53..425f374 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/Activator.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/Activator.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/constraint/ConstraintList.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/constraint/ConstraintList.java
index dfa5a94..691ff65 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/constraint/ConstraintList.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/constraint/ConstraintList.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/constraint/DynamicConstraint.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/constraint/DynamicConstraint.java
index c54c34b..4c638dd 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/constraint/DynamicConstraint.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/constraint/DynamicConstraint.java
@@ -12,7 +12,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/constraint/FilterableDynamicConstraint.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/constraint/FilterableDynamicConstraint.java
index 3f64ab7..525117b 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/constraint/FilterableDynamicConstraint.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/constraint/FilterableDynamicConstraint.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/constraint/IConstraint.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/constraint/IConstraint.java
index 291cb90..98011d1 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/constraint/IConstraint.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/constraint/IConstraint.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/constraint/PreferenceProperties.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/constraint/PreferenceProperties.java
index da88592..23df356 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/constraint/PreferenceProperties.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/constraint/PreferenceProperties.java
@@ -1,13 +1,20 @@
-package org.polarsys.chess.core.constraint;
-
-/**
- * The Class PreferenceProperties.
- */
-public class PreferenceProperties {
-	
-	/** The diagram in view. */
-	public static String DIAGRAM_IN_VIEW="DiagramInView";
-	
-	/** The palettes in view. */
-	public static String PALETTES_IN_VIEW="PaletteInView";
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+package org.polarsys.chess.core.constraint;

+

+/**

+ * The Class PreferenceProperties.

+ */

+public class PreferenceProperties {

+	

+	/** The diagram in view. */

+	public static String DIAGRAM_IN_VIEW="DiagramInView";

+	

+	/** The palettes in view. */

+	public static String PALETTES_IN_VIEW="PaletteInView";

+}

diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/constraint/SettableStatus.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/constraint/SettableStatus.java
index 73986c4..379998e 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/constraint/SettableStatus.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/constraint/SettableStatus.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/extensionpoint/IAddProfile.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/extensionpoint/IAddProfile.java
index 6a08064..8d424ce 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/extensionpoint/IAddProfile.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/extensionpoint/IAddProfile.java
@@ -1,26 +1,33 @@
-package org.polarsys.chess.core.extensionpoint;
-
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.uml2.uml.Model;
-
-/**
- * The Interface IAddProfile.
- */
-public interface IAddProfile {
-
-	/**
-	 * Applies a profile to the given model and resourceset.
-	 *
-	 * @param owner the owner
-	 * @param resourceSet the resource set
-	 */
-	void addProfile(Model owner, ResourceSet resourceSet);
-
-	/**
-	 * Loads a profile for the given ResourceSet.
-	 *
-	 * @param resourceSet the resource set
-	 */
-	void loadProfile(ResourceSet resourceSet);
-
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+package org.polarsys.chess.core.extensionpoint;

+

+import org.eclipse.emf.ecore.resource.ResourceSet;

+import org.eclipse.uml2.uml.Model;

+

+/**

+ * The Interface IAddProfile.

+ */

+public interface IAddProfile {

+

+	/**

+	 * Applies a profile to the given model and resourceset.

+	 *

+	 * @param owner the owner

+	 * @param resourceSet the resource set

+	 */

+	void addProfile(Model owner, ResourceSet resourceSet);

+

+	/**

+	 * Loads a profile for the given ResourceSet.

+	 *

+	 * @param resourceSet the resource set

+	 */

+	void loadProfile(ResourceSet resourceSet);

+

+}

diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/extensionpoint/AddProfileHandler.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/extensionpoint/AddProfileHandler.java
index 4e8675b..cbaff69 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/extensionpoint/AddProfileHandler.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/extensionpoint/AddProfileHandler.java
@@ -1,141 +1,148 @@
-package org.polarsys.chess.core.internal.extensionpoint;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.core.runtime.SafeRunner;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-//import org.eclipse.e4.core.di.annotations.Execute;
-import org.eclipse.uml2.uml.Model;
-import org.polarsys.chess.core.Activator;
-import org.polarsys.chess.core.extensionpoint.IAddProfile;
-
-
-/**
- * The Class AddProfileHandler.
- */
-public class AddProfileHandler {
-
-	  /** The Constant ADDPROFILE_ID. */
-  	private static final String ADDPROFILE_ID = 
-	      "org.polarsys.chess.addprofile";
-	  
-	  /**
-  	 * Execute add profile.
-  	 *
-  	 * @param registry the registry
-  	 * @param owner the owner
-  	 * @param resourceSet the resource set
-  	 */
-  	public void executeAddProfile(IExtensionRegistry registry, Model owner, ResourceSet resourceSet) {
-		  evaluateAddProfile(registry, owner, resourceSet);
-	  }
-	  
-	  /**
-  	 * Evaluate add profile.
-  	 *
-  	 * @param registry the registry
-  	 * @param owner the owner
-  	 * @param resourceSet the resource set
-  	 */
-  	private void evaluateAddProfile(IExtensionRegistry registry, Model owner, ResourceSet resourceSet) {
-	    IConfigurationElement[] config =
-	        registry.getConfigurationElementsFor(ADDPROFILE_ID);
-	    try {
-	      for (IConfigurationElement e : config) {
-	        System.out.println("Evaluating extension");
-	        final Object o =
-	            e.createExecutableExtension("class");
-	        if (o instanceof IAddProfile) {
-	        	addProfile(o, owner, resourceSet);
-	        }
-	      }
-	    } catch (CoreException ex) {
-	      System.out.println(ex.getMessage());
-	      Activator.error("evaluateAddProfile error", ex);
-	    }
-	  }
-
-	  /**
-  	 * Adds the profile.
-  	 *
-  	 * @param o the o
-  	 * @param owner the owner
-  	 * @param resourceSet the resource set
-  	 */
-  	private void addProfile(final Object o, final Model owner, final ResourceSet resourceSet) {
-	    ISafeRunnable runnable = new ISafeRunnable() {
-	      @Override
-	      public void handleException(Throwable e) {
-	        System.out.println("Exception in client");
-	        Activator.error("Exception in client", e);
-	      }
-
-	      @Override
-	      public void run() throws Exception {
-	    	((IAddProfile) o).addProfile(owner, resourceSet);
-	       
-	      }
-	    };
-	    SafeRunner.run(runnable);
-	  }
-	  
-	  /**
-  	 * Execute load profile.
-  	 *
-  	 * @param registry the registry
-  	 * @param resourceSet the resource set
-  	 */
-  	public void executeLoadProfile(IExtensionRegistry registry, ResourceSet resourceSet) {
-		  evaluateLoadProfile(registry, resourceSet);
-	  }
-	  
-	  /**
-  	 * Evaluate load profile.
-  	 *
-  	 * @param registry the registry
-  	 * @param resourceSet the resource set
-  	 */
-  	private void evaluateLoadProfile(IExtensionRegistry registry, ResourceSet resourceSet) {
-	    IConfigurationElement[] config =
-	        registry.getConfigurationElementsFor(ADDPROFILE_ID);
-	    try {
-	      for (IConfigurationElement e : config) {
-	        System.out.println("Evaluating extension");
-	        final Object o =
-	            e.createExecutableExtension("class");
-	        if (o instanceof IAddProfile) {
-	        	loadProfile(o, resourceSet);
-	        }
-	      }
-	    } catch (CoreException ex) {
-	      System.out.println(ex.getMessage());
-	      Activator.error("EvaluateLoadProfile error", ex);
-	    }
-	  }
-	  
-	  /**
-  	 * Load profile.
-  	 *
-  	 * @param o the o
-  	 * @param resourceSet the resource set
-  	 */
-  	private void loadProfile(final Object o, final ResourceSet resourceSet) {
-		    ISafeRunnable runnable = new ISafeRunnable() {
-		      @Override
-		      public void handleException(Throwable e) {
-		        System.out.println("Exception in client");
-		        Activator.error("Exception in client", e);
-		      }
-
-		      @Override
-		      public void run() throws Exception {    	  
-		    	  ((IAddProfile) o).loadProfile(resourceSet);
-		      }
-		    };
-		    SafeRunner.run(runnable);
-		  }
-	  
-	} 
-	
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+package org.polarsys.chess.core.internal.extensionpoint;

+

+import org.eclipse.core.runtime.CoreException;

+import org.eclipse.core.runtime.IConfigurationElement;

+import org.eclipse.core.runtime.IExtensionRegistry;

+import org.eclipse.core.runtime.ISafeRunnable;

+import org.eclipse.core.runtime.SafeRunner;

+import org.eclipse.emf.ecore.resource.ResourceSet;

+//import org.eclipse.e4.core.di.annotations.Execute;

+import org.eclipse.uml2.uml.Model;

+import org.polarsys.chess.core.Activator;

+import org.polarsys.chess.core.extensionpoint.IAddProfile;

+

+

+/**

+ * The Class AddProfileHandler.

+ */

+public class AddProfileHandler {

+

+	  /** The Constant ADDPROFILE_ID. */

+  	private static final String ADDPROFILE_ID = 

+	      "org.polarsys.chess.addprofile";

+	  

+	  /**

+  	 * Execute add profile.

+  	 *

+  	 * @param registry the registry

+  	 * @param owner the owner

+  	 * @param resourceSet the resource set

+  	 */

+  	public void executeAddProfile(IExtensionRegistry registry, Model owner, ResourceSet resourceSet) {

+		  evaluateAddProfile(registry, owner, resourceSet);

+	  }

+	  

+	  /**

+  	 * Evaluate add profile.

+  	 *

+  	 * @param registry the registry

+  	 * @param owner the owner

+  	 * @param resourceSet the resource set

+  	 */

+  	private void evaluateAddProfile(IExtensionRegistry registry, Model owner, ResourceSet resourceSet) {

+	    IConfigurationElement[] config =

+	        registry.getConfigurationElementsFor(ADDPROFILE_ID);

+	    try {

+	      for (IConfigurationElement e : config) {

+	        System.out.println("Evaluating extension");

+	        final Object o =

+	            e.createExecutableExtension("class");

+	        if (o instanceof IAddProfile) {

+	        	addProfile(o, owner, resourceSet);

+	        }

+	      }

+	    } catch (CoreException ex) {

+	      System.out.println(ex.getMessage());

+	      Activator.error("evaluateAddProfile error", ex);

+	    }

+	  }

+

+	  /**

+  	 * Adds the profile.

+  	 *

+  	 * @param o the o

+  	 * @param owner the owner

+  	 * @param resourceSet the resource set

+  	 */

+  	private void addProfile(final Object o, final Model owner, final ResourceSet resourceSet) {

+	    ISafeRunnable runnable = new ISafeRunnable() {

+	      @Override

+	      public void handleException(Throwable e) {

+	        System.out.println("Exception in client");

+	        Activator.error("Exception in client", e);

+	      }

+

+	      @Override

+	      public void run() throws Exception {

+	    	((IAddProfile) o).addProfile(owner, resourceSet);

+	       

+	      }

+	    };

+	    SafeRunner.run(runnable);

+	  }

+	  

+	  /**

+  	 * Execute load profile.

+  	 *

+  	 * @param registry the registry

+  	 * @param resourceSet the resource set

+  	 */

+  	public void executeLoadProfile(IExtensionRegistry registry, ResourceSet resourceSet) {

+		  evaluateLoadProfile(registry, resourceSet);

+	  }

+	  

+	  /**

+  	 * Evaluate load profile.

+  	 *

+  	 * @param registry the registry

+  	 * @param resourceSet the resource set

+  	 */

+  	private void evaluateLoadProfile(IExtensionRegistry registry, ResourceSet resourceSet) {

+	    IConfigurationElement[] config =

+	        registry.getConfigurationElementsFor(ADDPROFILE_ID);

+	    try {

+	      for (IConfigurationElement e : config) {

+	        System.out.println("Evaluating extension");

+	        final Object o =

+	            e.createExecutableExtension("class");

+	        if (o instanceof IAddProfile) {

+	        	loadProfile(o, resourceSet);

+	        }

+	      }

+	    } catch (CoreException ex) {

+	      System.out.println(ex.getMessage());

+	      Activator.error("EvaluateLoadProfile error", ex);

+	    }

+	  }

+	  

+	  /**

+  	 * Load profile.

+  	 *

+  	 * @param o the o

+  	 * @param resourceSet the resource set

+  	 */

+  	private void loadProfile(final Object o, final ResourceSet resourceSet) {

+		    ISafeRunnable runnable = new ISafeRunnable() {

+		      @Override

+		      public void handleException(Throwable e) {

+		        System.out.println("Exception in client");

+		        Activator.error("Exception in client", e);

+		      }

+

+		      @Override

+		      public void run() throws Exception {    	  

+		    	  ((IAddProfile) o).loadProfile(resourceSet);

+		      }

+		    };

+		    SafeRunner.run(runnable);

+		  }

+	  

+	} 

+	

diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/preferences/CHESSMainPage.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/preferences/CHESSMainPage.java
index decad64..3b3c0e8 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/preferences/CHESSMainPage.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/preferences/CHESSMainPage.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/preferences/ConstraintPreferenceInitializer.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/preferences/ConstraintPreferenceInitializer.java
index 380050d..c5c63f0 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/preferences/ConstraintPreferenceInitializer.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/preferences/ConstraintPreferenceInitializer.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/preferences/ConstraintPreferencePage.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/preferences/ConstraintPreferencePage.java
index 34b3729..3bcad0b 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/preferences/ConstraintPreferencePage.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/preferences/ConstraintPreferencePage.java
@@ -8,7 +8,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/preferences/LabelField.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/preferences/LabelField.java
index 0a5653c..6fdf3e4 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/preferences/LabelField.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/preferences/LabelField.java
@@ -8,7 +8,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/util/InternalCHESSProjectSupport.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/util/InternalCHESSProjectSupport.java
index d8ced6b..77c2e08 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/util/InternalCHESSProjectSupport.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/util/InternalCHESSProjectSupport.java
@@ -1,211 +1,218 @@
-package org.polarsys.chess.core.internal.util;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.List;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.Bundle;
-import org.polarsys.chess.core.natures.CHESSNature;
-import org.polarsys.chess.core.util.CHESSProjectSupport;
-
-/**
- * The Class InternalCHESSProjectSupport.
- */
-public class InternalCHESSProjectSupport {
-
-	/**
-	 * Adds the nature.
-	 *
-	 * @param project the project
-	 * @throws CoreException the core exception
-	 */
-	public static void addNature(IProject project) throws CoreException {
-		if (!project.hasNature(CHESSNature.NATURE_ID)) {
-			IProjectDescription description = project.getDescription();
-			String[] prevNatures = description.getNatureIds();
-			String[] newNatures = new String[prevNatures.length + 1];
-			System.arraycopy(prevNatures, 0, newNatures, 0, prevNatures.length);
-			newNatures[prevNatures.length] = CHESSNature.NATURE_ID;
-			description.setNatureIds(newNatures);
-	        project.setDescription(description, null);
-		}
-	}
-
-	/**
-	 * Creates the base project.
-	 *
-	 * @param projectName the project name
-	 * @param location the location
-	 * @return the i project
-	 */
-	public static IProject createBaseProject(String projectName, URI location) {
-		IProject newProject = ResourcesPlugin.getWorkspace().getRoot()
-				.getProject(projectName);
-	
-		if (!newProject.exists()) {
-			URI projectLocation = location;
-			IProjectDescription desc = newProject.getWorkspace()
-					.newProjectDescription(newProject.getName());
-			if (location != null
-					&& ResourcesPlugin.getWorkspace().getRoot()
-							.getLocationURI().equals(location)) {
-				projectLocation = null;
-			}
-			desc.setLocationURI(projectLocation);
-			try {
-				newProject.create(desc, null);
-				if (!newProject.isOpen()) {
-					newProject.open(null);
-				}
-			} catch (CoreException e) {
-				e.printStackTrace();
-			}
-		}
-		return newProject;
-	}
-
-	/**
-	 * Adds the to project structure.
-	 *
-	 * @param newProject the new project
-	 * @param paths the paths
-	 * @throws CoreException the core exception
-	 */
-	@SuppressWarnings("unused")
-	private static void addToProjectStructure(final IProject newProject,
-			final String[] paths) throws CoreException {
-		for (String path : paths) {
-			IFolder etcFolder = newProject.getFolder(path);
-			CHESSProjectSupport.createFolder(etcFolder);
-		}
-	}
-
-	/**
-	 * This is a copy of org.eclipse.core.internal.utils.FileUtil.
-	 * Converts a URI to an IPath.  Returns null if the URI cannot be represented
-	 * as an IPath.
-	 * <p>
-	 * Note this method differs from URIUtil in its handling of relative URIs
-	 * as being relative to path variables.
-	 *
-	 * @param uri the uri
-	 * @return the i path
-	 */
-	public static IPath toPath(URI uri) {
-		if (uri == null)
-			return null;
-		final String scheme = uri.getScheme();
-		// null scheme represents path variable
-		if (scheme == null || EFS.SCHEME_FILE.equals(scheme))
-			return new Path(uri.getSchemeSpecificPart());
-		return null;
-	}
-
-	/**
-	 * Gets the plugin install location.
-	 *
-	 * @param pluginId the plugin id
-	 * @return the plugin install location
-	 * @throws Exception the exception
-	 */
-	public static String getPluginInstallLocation(String pluginId) throws Exception {
-		Bundle bundle = Platform.getBundle(pluginId);
-		URL locationUrl = FileLocator.find(bundle,new Path("/"), null);
-		URL fileUrl = FileLocator.toFileURL(locationUrl);
-		return fileUrl.getFile();
-	}
-
-	/**
-	 * Gets the name without extension.
-	 *
-	 * @param inputFile the input file
-	 * @return the name without extension
-	 */
-	public static String getNameWithoutExtension(IFile inputFile) {
-		String inputName = inputFile.getName();
-		int extensionIndex = inputName.lastIndexOf('.');
-		if (extensionIndex != -1)
-			inputName = inputName.substring(0, extensionIndex);
-		return inputName;
-	}
-
-	/**
-	 * File copy.
-	 *
-	 * @param in the in
-	 * @param out the out
-	 * @throws IOException Signals that an I/O exception has occurred.
-	 */
-	public static void fileCopy(InputStream in, FileOutputStream out)
-			throws IOException {
-		byte[] buf = new byte[8192];
-		while (true) {
-			int length = in.read(buf);
-			if (length < 0)
-				break;
-			out.write(buf, 0, length);
-		}
-	
-		try {
-			in.close();
-		} catch (IOException ignore) {
-		}
-		try {
-			out.close();
-		} catch (IOException ignore) {
-		}
-	}
-
-	/**
-	 * Gets the bundle contents.
-	 *
-	 * @param activator the activator
-	 * @param path the path
-	 * @param collectedPaths the collected paths
-	 * @return the bundle contents
-	 */
-	public static void getBundleContents(Plugin activator, String path,
-			List<String> collectedPaths) {
-		Enumeration<?> enums = activator.getBundle().getEntryPaths(path);
-	
-		while (enums.hasMoreElements()) {
-			Object object = enums.nextElement();
-			Enumeration<?> tmpEnum = activator.getBundle().getEntryPaths(
-					object.toString());
-			if (tmpEnum != null)
-				getBundleContents(activator, object.toString(), collectedPaths);
-			else {
-				collectedPaths.add(object.toString());
-			}
-		}
-	}
-
-	/**
-	 * Gets the i file from absolute path.
-	 *
-	 * @param path the path
-	 * @return the i file from absolute path
-	 */
-	public static IFile getIFileFromAbsolutePath(String path) {
-		IPath location = Path.fromOSString(path);
-		return ResourcesPlugin.getWorkspace().getRoot()
-				.getFileForLocation(location);
-	}
-
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+package org.polarsys.chess.core.internal.util;

+

+import java.io.FileOutputStream;

+import java.io.IOException;

+import java.io.InputStream;

+import java.net.URI;

+import java.net.URL;

+import java.util.Enumeration;

+import java.util.List;

+

+import org.eclipse.core.filesystem.EFS;

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IFolder;

+import org.eclipse.core.resources.IProject;

+import org.eclipse.core.resources.IProjectDescription;

+import org.eclipse.core.resources.ResourcesPlugin;

+import org.eclipse.core.runtime.CoreException;

+import org.eclipse.core.runtime.FileLocator;

+import org.eclipse.core.runtime.IPath;

+import org.eclipse.core.runtime.Path;

+import org.eclipse.core.runtime.Platform;

+import org.eclipse.core.runtime.Plugin;

+import org.osgi.framework.Bundle;

+import org.polarsys.chess.core.natures.CHESSNature;

+import org.polarsys.chess.core.util.CHESSProjectSupport;

+

+/**

+ * The Class InternalCHESSProjectSupport.

+ */

+public class InternalCHESSProjectSupport {

+

+	/**

+	 * Adds the nature.

+	 *

+	 * @param project the project

+	 * @throws CoreException the core exception

+	 */

+	public static void addNature(IProject project) throws CoreException {

+		if (!project.hasNature(CHESSNature.NATURE_ID)) {

+			IProjectDescription description = project.getDescription();

+			String[] prevNatures = description.getNatureIds();

+			String[] newNatures = new String[prevNatures.length + 1];

+			System.arraycopy(prevNatures, 0, newNatures, 0, prevNatures.length);

+			newNatures[prevNatures.length] = CHESSNature.NATURE_ID;

+			description.setNatureIds(newNatures);

+	        project.setDescription(description, null);

+		}

+	}

+

+	/**

+	 * Creates the base project.

+	 *

+	 * @param projectName the project name

+	 * @param location the location

+	 * @return the i project

+	 */

+	public static IProject createBaseProject(String projectName, URI location) {

+		IProject newProject = ResourcesPlugin.getWorkspace().getRoot()

+				.getProject(projectName);

+	

+		if (!newProject.exists()) {

+			URI projectLocation = location;

+			IProjectDescription desc = newProject.getWorkspace()

+					.newProjectDescription(newProject.getName());

+			if (location != null

+					&& ResourcesPlugin.getWorkspace().getRoot()

+							.getLocationURI().equals(location)) {

+				projectLocation = null;

+			}

+			desc.setLocationURI(projectLocation);

+			try {

+				newProject.create(desc, null);

+				if (!newProject.isOpen()) {

+					newProject.open(null);

+				}

+			} catch (CoreException e) {

+				e.printStackTrace();

+			}

+		}

+		return newProject;

+	}

+

+	/**

+	 * Adds the to project structure.

+	 *

+	 * @param newProject the new project

+	 * @param paths the paths

+	 * @throws CoreException the core exception

+	 */

+	@SuppressWarnings("unused")

+	private static void addToProjectStructure(final IProject newProject,

+			final String[] paths) throws CoreException {

+		for (String path : paths) {

+			IFolder etcFolder = newProject.getFolder(path);

+			CHESSProjectSupport.createFolder(etcFolder);

+		}

+	}

+

+	/**

+	 * This is a copy of org.eclipse.core.internal.utils.FileUtil.

+	 * Converts a URI to an IPath.  Returns null if the URI cannot be represented

+	 * as an IPath.

+	 * <p>

+	 * Note this method differs from URIUtil in its handling of relative URIs

+	 * as being relative to path variables.

+	 *

+	 * @param uri the uri

+	 * @return the i path

+	 */

+	public static IPath toPath(URI uri) {

+		if (uri == null)

+			return null;

+		final String scheme = uri.getScheme();

+		// null scheme represents path variable

+		if (scheme == null || EFS.SCHEME_FILE.equals(scheme))

+			return new Path(uri.getSchemeSpecificPart());

+		return null;

+	}

+

+	/**

+	 * Gets the plugin install location.

+	 *

+	 * @param pluginId the plugin id

+	 * @return the plugin install location

+	 * @throws Exception the exception

+	 */

+	public static String getPluginInstallLocation(String pluginId) throws Exception {

+		Bundle bundle = Platform.getBundle(pluginId);

+		URL locationUrl = FileLocator.find(bundle,new Path("/"), null);

+		URL fileUrl = FileLocator.toFileURL(locationUrl);

+		return fileUrl.getFile();

+	}

+

+	/**

+	 * Gets the name without extension.

+	 *

+	 * @param inputFile the input file

+	 * @return the name without extension

+	 */

+	public static String getNameWithoutExtension(IFile inputFile) {

+		String inputName = inputFile.getName();

+		int extensionIndex = inputName.lastIndexOf('.');

+		if (extensionIndex != -1)

+			inputName = inputName.substring(0, extensionIndex);

+		return inputName;

+	}

+

+	/**

+	 * File copy.

+	 *

+	 * @param in the in

+	 * @param out the out

+	 * @throws IOException Signals that an I/O exception has occurred.

+	 */

+	public static void fileCopy(InputStream in, FileOutputStream out)

+			throws IOException {

+		byte[] buf = new byte[8192];

+		while (true) {

+			int length = in.read(buf);

+			if (length < 0)

+				break;

+			out.write(buf, 0, length);

+		}

+	

+		try {

+			in.close();

+		} catch (IOException ignore) {

+		}

+		try {

+			out.close();

+		} catch (IOException ignore) {

+		}

+	}

+

+	/**

+	 * Gets the bundle contents.

+	 *

+	 * @param activator the activator

+	 * @param path the path

+	 * @param collectedPaths the collected paths

+	 * @return the bundle contents

+	 */

+	public static void getBundleContents(Plugin activator, String path,

+			List<String> collectedPaths) {

+		Enumeration<?> enums = activator.getBundle().getEntryPaths(path);

+	

+		while (enums.hasMoreElements()) {

+			Object object = enums.nextElement();

+			Enumeration<?> tmpEnum = activator.getBundle().getEntryPaths(

+					object.toString());

+			if (tmpEnum != null)

+				getBundleContents(activator, object.toString(), collectedPaths);

+			else {

+				collectedPaths.add(object.toString());

+			}

+		}

+	}

+

+	/**

+	 * Gets the i file from absolute path.

+	 *

+	 * @param path the path

+	 * @return the i file from absolute path

+	 */

+	public static IFile getIFileFromAbsolutePath(String path) {

+		IPath location = Path.fromOSString(path);

+		return ResourcesPlugin.getWorkspace().getRoot()

+				.getFileForLocation(location);

+	}

+

+}

diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/util/InternalConsoleUtil.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/util/InternalConsoleUtil.java
index 853c2be..eb07e01 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/util/InternalConsoleUtil.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/util/InternalConsoleUtil.java
@@ -1,76 +1,83 @@
-package org.polarsys.chess.core.internal.util;
-
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.PrintStream;
-
-import org.eclipse.ui.console.ConsolePlugin;
-import org.eclipse.ui.console.IConsole;
-import org.eclipse.ui.console.IConsoleManager;
-import org.eclipse.ui.console.MessageConsole;
-import org.eclipse.ui.console.MessageConsoleStream;
-import org.polarsys.chess.core.util.CHESSProjectSupport;
-
-/**
- * The Class InternalConsoleUtil.
- */
-public class InternalConsoleUtil {
-
-	/**
-	 * Find console.
-	 *
-	 * @param name the name
-	 * @return the message console
-	 */
-	public static MessageConsole findConsole(final String name) {
-	      ConsolePlugin plugin = ConsolePlugin.getDefault();
-	      IConsoleManager conMan = plugin.getConsoleManager();
-	      IConsole[] existing = conMan.getConsoles();
-	      for (int i = 0; i < existing.length; i++)
-	         if (name.equals(existing[i].getName()))
-	            return (MessageConsole) existing[i];
-	      //no console found, so create a new one
-	      MessageConsole myConsole = new MessageConsole(name, null);
-	      conMan.addConsoles(new IConsole[]{myConsole});
-	      return myConsole;
-	   }
-
-	/**
-	 * Find CHES sconsole.
-	 *
-	 * @return the message console stream
-	 */
-	public static MessageConsoleStream findCHESSconsole(){
-		MessageConsole myConsole = findConsole(CHESSProjectSupport.CHESS_CONSOLE_NAME);
-		return myConsole.newMessageStream();
-	}
-
-	/**
-	 * Write log.
-	 *
-	 * @param message the message
-	 * @throws FileNotFoundException the file not found exception
-	 */
-	public static void writeLog(String message) throws FileNotFoundException {
-		FileOutputStream out = new FileOutputStream(InternalConsoleUtil.getEclipseInstallLocation()
-				+ "CHESSLOG");
-		PrintStream p = new PrintStream(out);
-		p.println(message);
-		p.close();
-	}
-
-	/**
-	 * Gets the eclipse install location.
-	 *
-	 * @return the eclipse install location
-	 */
-	public static String getEclipseInstallLocation() {
-		if (System.getProperty("os.name").equals("Linux"))
-			return System.getProperties().get("osgi.install.area").toString()
-					.substring(5);
-		else
-			return System.getProperties().get("osgi.install.area").toString()
-					.substring(6);
-	}
-
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+package org.polarsys.chess.core.internal.util;

+

+import java.io.FileNotFoundException;

+import java.io.FileOutputStream;

+import java.io.PrintStream;

+

+import org.eclipse.ui.console.ConsolePlugin;

+import org.eclipse.ui.console.IConsole;

+import org.eclipse.ui.console.IConsoleManager;

+import org.eclipse.ui.console.MessageConsole;

+import org.eclipse.ui.console.MessageConsoleStream;

+import org.polarsys.chess.core.util.CHESSProjectSupport;

+

+/**

+ * The Class InternalConsoleUtil.

+ */

+public class InternalConsoleUtil {

+

+	/**

+	 * Find console.

+	 *

+	 * @param name the name

+	 * @return the message console

+	 */

+	public static MessageConsole findConsole(final String name) {

+	      ConsolePlugin plugin = ConsolePlugin.getDefault();

+	      IConsoleManager conMan = plugin.getConsoleManager();

+	      IConsole[] existing = conMan.getConsoles();

+	      for (int i = 0; i < existing.length; i++)

+	         if (name.equals(existing[i].getName()))

+	            return (MessageConsole) existing[i];

+	      //no console found, so create a new one

+	      MessageConsole myConsole = new MessageConsole(name, null);

+	      conMan.addConsoles(new IConsole[]{myConsole});

+	      return myConsole;

+	   }

+

+	/**

+	 * Find CHES sconsole.

+	 *

+	 * @return the message console stream

+	 */

+	public static MessageConsoleStream findCHESSconsole(){

+		MessageConsole myConsole = findConsole(CHESSProjectSupport.CHESS_CONSOLE_NAME);

+		return myConsole.newMessageStream();

+	}

+

+	/**

+	 * Write log.

+	 *

+	 * @param message the message

+	 * @throws FileNotFoundException the file not found exception

+	 */

+	public static void writeLog(String message) throws FileNotFoundException {

+		FileOutputStream out = new FileOutputStream(InternalConsoleUtil.getEclipseInstallLocation()

+				+ "CHESSLOG");

+		PrintStream p = new PrintStream(out);

+		p.println(message);

+		p.close();

+	}

+

+	/**

+	 * Gets the eclipse install location.

+	 *

+	 * @return the eclipse install location

+	 */

+	public static String getEclipseInstallLocation() {

+		if (System.getProperty("os.name").equals("Linux"))

+			return System.getProperties().get("osgi.install.area").toString()

+					.substring(5);

+		else

+			return System.getProperties().get("osgi.install.area").toString()

+					.substring(6);

+	}

+

+}

diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/util/MainRegistry.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/util/MainRegistry.java
index 145210d..486b592 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/util/MainRegistry.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/util/MainRegistry.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/views/InternalViewUtils.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/views/InternalViewUtils.java
index c164397..5614b65 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/views/InternalViewUtils.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/views/InternalViewUtils.java
@@ -12,7 +12,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/views/ReloadXMLPermissions.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/views/ReloadXMLPermissions.java
index 5ac8ef3..5636628 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/views/ReloadXMLPermissions.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/views/ReloadXMLPermissions.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/views/ViewPermissions.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/views/ViewPermissions.java
index 1f3148c..1272e36 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/views/ViewPermissions.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/views/ViewPermissions.java
@@ -12,7 +12,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/views/commands/CreateViewsCommand.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/views/commands/CreateViewsCommand.java
index b5e640e..85e66a6 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/views/commands/CreateViewsCommand.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/views/commands/CreateViewsCommand.java
@@ -11,7 +11,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/views/permissions/EntryId.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/views/permissions/EntryId.java
index d24f64a..9c953d3 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/views/permissions/EntryId.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/views/permissions/EntryId.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/views/permissions/PermissionEntry.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/views/permissions/PermissionEntry.java
index 21a29bc..b755008 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/views/permissions/PermissionEntry.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/views/permissions/PermissionEntry.java
@@ -12,7 +12,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/views/permissions/PermissionList.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/views/permissions/PermissionList.java
index 9e86db3..4af5190 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/views/permissions/PermissionList.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/internal/views/permissions/PermissionList.java
@@ -12,7 +12,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/natures/CHESSNature.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/natures/CHESSNature.java
index 3cb34c2..46ae205 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/natures/CHESSNature.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/natures/CHESSNature.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/notifications/ResourceNotification.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/notifications/ResourceNotification.java
index 6b96be5..50a3477 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/notifications/ResourceNotification.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/notifications/ResourceNotification.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/preferences/FilterableConstraint.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/preferences/FilterableConstraint.java
index 885dbd7..2327fa7 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/preferences/FilterableConstraint.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/preferences/FilterableConstraint.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/preferences/IFilterable.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/preferences/IFilterable.java
index c1b0e52..0a469d7 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/preferences/IFilterable.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/preferences/IFilterable.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/profiles/CHESSProfileManager.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/profiles/CHESSProfileManager.java
index 1e2c9fe..8963397 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/profiles/CHESSProfileManager.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/profiles/CHESSProfileManager.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/profiles/MARTEProfileManager.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/profiles/MARTEProfileManager.java
index 3c2d4ca..dbdfb0f 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/profiles/MARTEProfileManager.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/profiles/MARTEProfileManager.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/profiles/SysMLProfileManager.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/profiles/SysMLProfileManager.java
index b5dd9b1..8f4ce8a 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/profiles/SysMLProfileManager.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/profiles/SysMLProfileManager.java
@@ -12,7 +12,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/resourcelistener/ResourceSetListenerExtra.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/resourcelistener/ResourceSetListenerExtra.java
index 824ce93..0ea3649 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/resourcelistener/ResourceSetListenerExtra.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/resourcelistener/ResourceSetListenerExtra.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/resourcelistener/ResourceSetListenerManager.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/resourcelistener/ResourceSetListenerManager.java
index 3cd3318..e58f38c 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/resourcelistener/ResourceSetListenerManager.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/resourcelistener/ResourceSetListenerManager.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/resourcelistener/SelectionListenerExtra.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/resourcelistener/SelectionListenerExtra.java
index 7adc45e..58ce3cc 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/resourcelistener/SelectionListenerExtra.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/resourcelistener/SelectionListenerExtra.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/resourcelistener/SelectionListenerManager.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/resourcelistener/SelectionListenerManager.java
index f87893f..7dc1548 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/resourcelistener/SelectionListenerManager.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/resourcelistener/SelectionListenerManager.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/transformationExecutor/ITransformationExecutor.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/transformationExecutor/ITransformationExecutor.java
index 4ab5c96..99cb3af 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/transformationExecutor/ITransformationExecutor.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/transformationExecutor/ITransformationExecutor.java
@@ -1,25 +1,32 @@
-package org.polarsys.chess.core.transformationExecutor;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.uml2.uml.Package;
-
-/**
- * This interface defines the transformation to execute.
- *
- */
-public interface ITransformationExecutor {
-	/**
-	 * Executes the transformation.
-	 * 
-	 * @param modelFile  the input model for the transformation
-	 * @param transformationDirectory  the directory where the output of the transformation will be created
-	 * @param monitor  the progress monitor
-	 * @param psmPackage  the PSM package to use as input for the transformation
-	 * @return  the resulting status of the transformation
-	 * @throws Exception  when something went wrong during the transformation
-	 */
-	public String execute(IFile modelFile, IFolder transformationDirectory,
-			IProgressMonitor monitor, Package psmPackage) throws Exception;
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+package org.polarsys.chess.core.transformationExecutor;

+

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IFolder;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.uml2.uml.Package;

+

+/**

+ * This interface defines the transformation to execute.

+ *

+ */

+public interface ITransformationExecutor {

+	/**

+	 * Executes the transformation.

+	 * 

+	 * @param modelFile  the input model for the transformation

+	 * @param transformationDirectory  the directory where the output of the transformation will be created

+	 * @param monitor  the progress monitor

+	 * @param psmPackage  the PSM package to use as input for the transformation

+	 * @return  the resulting status of the transformation

+	 * @throws Exception  when something went wrong during the transformation

+	 */

+	public String execute(IFile modelFile, IFolder transformationDirectory,

+			IProgressMonitor monitor, Package psmPackage) throws Exception;

+}

diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/transformationExecutor/TransformationExecutorManager.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/transformationExecutor/TransformationExecutorManager.java
index bc6b633..e91dbcd 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/transformationExecutor/TransformationExecutorManager.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/transformationExecutor/TransformationExecutorManager.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/AnalysisResultData.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/AnalysisResultData.java
index 3c64b23..6bf8d5a 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/AnalysisResultData.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/AnalysisResultData.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Laura Baracchi  laura.baracchi@intecs.it  - initial API and implementation and/or initial documentation
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/CHESSProjectSupport.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/CHESSProjectSupport.java
index aead18d..aaff344 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/CHESSProjectSupport.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/CHESSProjectSupport.java
@@ -8,7 +8,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/EndToEndResultData.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/EndToEndResultData.java
index 762eb40..4524048 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/EndToEndResultData.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/EndToEndResultData.java
@@ -1,30 +1,37 @@
-/* ------------------------------------------------------------------------------
- - Copyright (c) 2015 Intecs.
- - 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:
- -    L. Baracchi, laura.baracchi@intecs.it
- ------------------------------------------------------------------------------*/
-
-package org.polarsys.chess.core.util;
-
-/**
- * Used to save and display the results data from End to End Response Time Analysis .
- */
-
-public class EndToEndResultData {
-	
-	/** The scenario name. */
-	public String scenarioName ="";
-	
-	/** The deadline. */
-	public String deadline ="";
-	
-	/** The resp time. */
-	public String respTime ="";
-}
-
-
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+/* ------------------------------------------------------------------------------

+ - Copyright (c) 2015 Intecs.

+ - All rights reserved. This program and the accompanying materials

+ - are made available under the terms of the Eclipse Public License v2.0

+ - which accompanies this distribution, and is available at

+ - http://www.eclipse.org/legal/epl-v20.html

+ -

+ - Contributors:

+ -    L. Baracchi, laura.baracchi@intecs.it

+ ------------------------------------------------------------------------------*/

+

+package org.polarsys.chess.core.util;

+

+/**

+ * Used to save and display the results data from End to End Response Time Analysis .

+ */

+

+public class EndToEndResultData {

+	

+	/** The scenario name. */

+	public String scenarioName ="";

+	

+	/** The deadline. */

+	public String deadline ="";

+	

+	/** The resp time. */

+	public String respTime ="";

+}

+

+

diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/HWAnalysisResultData.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/HWAnalysisResultData.java
index e7c2629..cd35c3a 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/HWAnalysisResultData.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/HWAnalysisResultData.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Laura Baracchi  laura.baracchi@intecs.it  - initial API and implementation and/or initial documentation
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/NotificationManager.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/NotificationManager.java
index 73773cb..033c2eb 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/NotificationManager.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/NotificationManager.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/commands/AddDiagramElement.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/commands/AddDiagramElement.java
index dce5f91..e706b5c 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/commands/AddDiagramElement.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/commands/AddDiagramElement.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/commands/InitCHESSModelCommand.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/commands/InitCHESSModelCommand.java
index 2e4de3c..90e83b4 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/commands/InitCHESSModelCommand.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/commands/InitCHESSModelCommand.java
@@ -1,69 +1,76 @@
-package org.polarsys.chess.core.util.commands;
-
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.uml.tools.model.UmlUtils;
-import org.eclipse.uml2.uml.Model;
-import org.polarsys.chess.core.internal.extensionpoint.AddProfileHandler;
-import org.polarsys.chess.core.internal.views.commands.CreateViewsCommand;
-
-/**
- * This class extends the {@link RecordingCommand} class to implement the command to initialize a
- * CHESS model.
- *
- */
-public class InitCHESSModelCommand extends RecordingCommand {
-
-	/** The model set. */
-	private ModelSet modelSet;
-
-	/**
-	 * Initializes the command.
-	 * 
-	 * @param editingDomain  the editing domain where the command takes place
-	 * @param modelSet  the model set where the command works in
-	 */
-	public InitCHESSModelCommand(TransactionalEditingDomain editingDomain, ModelSet modelSet) {
-			super(editingDomain);
-			this.modelSet = modelSet;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()
-	 */
-	@Override
-	protected void doExecute() {
-		
-		EObject  owner = getRootElement(UmlUtils.getUmlResource(modelSet));
-		CreateViewsCommand.viewsToModel((Model)owner, modelSet/*, chess, marte, sysml*/);	
-		
-		//let external plugins to add additional profiles
-		AddProfileHandler h = new AddProfileHandler();
-		IExtensionRegistry reg =  Platform.getExtensionRegistry();
-		h.executeAddProfile(reg, (Model)owner, modelSet);
-		
-	}
-	
-	/**
-	 * Gets the root element.
-	 *
-	 * @param modelResource the model resource
-	 * @return the root element
-	 */
-	protected EObject getRootElement(Resource modelResource) {
-		EObject rootElement = null;
-		if(modelResource != null && modelResource.getContents() != null && modelResource.getContents().size() > 0) {
-			Object root = modelResource.getContents().get(0);
-			if(root instanceof EObject) {
-				rootElement = (EObject)root;
-			}
-		}
-		return rootElement;
-	}
-
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+package org.polarsys.chess.core.util.commands;

+

+import org.eclipse.core.runtime.IExtensionRegistry;

+import org.eclipse.core.runtime.Platform;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.papyrus.infra.core.resource.ModelSet;

+import org.eclipse.papyrus.uml.tools.model.UmlUtils;

+import org.eclipse.uml2.uml.Model;

+import org.polarsys.chess.core.internal.extensionpoint.AddProfileHandler;

+import org.polarsys.chess.core.internal.views.commands.CreateViewsCommand;

+

+/**

+ * This class extends the {@link RecordingCommand} class to implement the command to initialize a

+ * CHESS model.

+ *

+ */

+public class InitCHESSModelCommand extends RecordingCommand {

+

+	/** The model set. */

+	private ModelSet modelSet;

+

+	/**

+	 * Initializes the command.

+	 * 

+	 * @param editingDomain  the editing domain where the command takes place

+	 * @param modelSet  the model set where the command works in

+	 */

+	public InitCHESSModelCommand(TransactionalEditingDomain editingDomain, ModelSet modelSet) {

+			super(editingDomain);

+			this.modelSet = modelSet;

+	}

+	

+	/* (non-Javadoc)

+	 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()

+	 */

+	@Override

+	protected void doExecute() {

+		

+		EObject  owner = getRootElement(UmlUtils.getUmlResource(modelSet));

+		CreateViewsCommand.viewsToModel((Model)owner, modelSet/*, chess, marte, sysml*/);	

+		

+		//let external plugins to add additional profiles

+		AddProfileHandler h = new AddProfileHandler();

+		IExtensionRegistry reg =  Platform.getExtensionRegistry();

+		h.executeAddProfile(reg, (Model)owner, modelSet);

+		

+	}

+	

+	/**

+	 * Gets the root element.

+	 *

+	 * @param modelResource the model resource

+	 * @return the root element

+	 */

+	protected EObject getRootElement(Resource modelResource) {

+		EObject rootElement = null;

+		if(modelResource != null && modelResource.getContents() != null && modelResource.getContents().size() > 0) {

+			Object root = modelResource.getContents().get(0);

+			if(root instanceof EObject) {

+				rootElement = (EObject)root;

+			}

+		}

+		return rootElement;

+	}

+

+}

diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/uml/ModelError.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/uml/ModelError.java
index 58ac14a..1a87ca8 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/uml/ModelError.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/uml/ModelError.java
@@ -1,30 +1,37 @@
-package org.polarsys.chess.core.util.uml;
-
-/**
- * The Class ModelError.
- */
-public class ModelError extends Exception {
-
-	/**
-	 * Instantiates a new model error.
-	 *
-	 * @param message the message
-	 */
-	public ModelError(String message) {
-		super(message);
-	}
-	
-	/**
-	 * Instantiates a new model error.
-	 *
-	 * @param messageFormat the message format
-	 * @param args the args
-	 */
-	public ModelError(String messageFormat, Object... args) {
-		super(String.format(messageFormat, args));
-	}
-
-	/** The Constant serialVersionUID. */
-	private static final long serialVersionUID = -3470869043917284064L;
-
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+package org.polarsys.chess.core.util.uml;

+

+/**

+ * The Class ModelError.

+ */

+public class ModelError extends Exception {

+

+	/**

+	 * Instantiates a new model error.

+	 *

+	 * @param message the message

+	 */

+	public ModelError(String message) {

+		super(message);

+	}

+	

+	/**

+	 * Instantiates a new model error.

+	 *

+	 * @param messageFormat the message format

+	 * @param args the args

+	 */

+	public ModelError(String messageFormat, Object... args) {

+		super(String.format(messageFormat, args));

+	}

+

+	/** The Constant serialVersionUID. */

+	private static final long serialVersionUID = -3470869043917284064L;

+

+}

diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/uml/ProfileUtils.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/uml/ProfileUtils.java
index 9fef9fb..d54cc31 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/uml/ProfileUtils.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/uml/ProfileUtils.java
@@ -8,7 +8,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/uml/ResourceUtils.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/uml/ResourceUtils.java
index c4ee686..2795de1 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/uml/ResourceUtils.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/uml/ResourceUtils.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/uml/UMLUtils.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/uml/UMLUtils.java
index 3d4c78b..e01f402 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/uml/UMLUtils.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/uml/UMLUtils.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/uml/ValueNFP.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/uml/ValueNFP.java
index a7e2848..4a774af 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/uml/ValueNFP.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/util/uml/ValueNFP.java
@@ -1,24 +1,31 @@
-/* ------------------------------------------------------------------------------
- - Copyright (c) 2015 Intecs.
- - 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:
- -    L. Baracchi, laura.baracchi@intecs.it
- ------------------------------------------------------------------------------*/
-
-package org.polarsys.chess.core.util.uml;
-
-/**
- * The Class ValueNFP.
- */
-public class ValueNFP {
-	
-	/** The unit. */
-	public String unit = new String();
-	
-	/** The value. */
-	public Double value = 0.0;
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+/* ------------------------------------------------------------------------------

+ - Copyright (c) 2015 Intecs.

+ - All rights reserved. This program and the accompanying materials

+ - are made available under the terms of the Eclipse Public License v2.0

+ - which accompanies this distribution, and is available at

+ - http://www.eclipse.org/legal/epl-v20.html

+ -

+ - Contributors:

+ -    L. Baracchi, laura.baracchi@intecs.it

+ ------------------------------------------------------------------------------*/

+

+package org.polarsys.chess.core.util.uml;

+

+/**

+ * The Class ValueNFP.

+ */

+public class ValueNFP {

+	

+	/** The unit. */

+	public String unit = new String();

+	

+	/** The value. */

+	public Double value = 0.0;

+}

diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/views/DiagramStatus.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/views/DiagramStatus.java
index 8fa97c9..89aca10 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/views/DiagramStatus.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/views/DiagramStatus.java
@@ -12,7 +12,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/views/ViewDiagramAssociations.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/views/ViewDiagramAssociations.java
index ce672c4..29de031 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/views/ViewDiagramAssociations.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/views/ViewDiagramAssociations.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/views/ViewUtils.java b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/views/ViewUtils.java
index 46324d8..8ae642c 100644
--- a/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/views/ViewUtils.java
+++ b/plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/views/ViewUtils.java
@@ -11,7 +11,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/theme/frame_theme.css b/plugins/org.polarsys.chess.core/theme/frame_theme.css
index ac38106..953d1ce 100644
--- a/plugins/org.polarsys.chess.core/theme/frame_theme.css
+++ b/plugins/org.polarsys.chess.core/theme/frame_theme.css
@@ -2,9 +2,9 @@
  * Copyright (c) 2012 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr
diff --git a/plugins/org.polarsys.chess.core/theme/papyrus_theme.css b/plugins/org.polarsys.chess.core/theme/papyrus_theme.css
index a70e1c2..ecf30bf 100644
--- a/plugins/org.polarsys.chess.core/theme/papyrus_theme.css
+++ b/plugins/org.polarsys.chess.core/theme/papyrus_theme.css
@@ -2,9 +2,9 @@
  * Copyright (c) 2012 CEA LIST.

  * 

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *

  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr

diff --git a/plugins/org.polarsys.chess.core/theme/sysml.css b/plugins/org.polarsys.chess.core/theme/sysml.css
index 72a3235..500c9b4 100644
--- a/plugins/org.polarsys.chess.core/theme/sysml.css
+++ b/plugins/org.polarsys.chess.core/theme/sysml.css
@@ -2,9 +2,9 @@
  * 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

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *

  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr

diff --git a/plugins/org.polarsys.chess.core/theme/umlBase.css b/plugins/org.polarsys.chess.core/theme/umlBase.css
index a743d9d..33dc169 100644
--- a/plugins/org.polarsys.chess.core/theme/umlBase.css
+++ b/plugins/org.polarsys.chess.core/theme/umlBase.css
@@ -2,9 +2,9 @@
  * Copyright (c) 2015 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Generic shape default value implementation. Default symbol implementation.
diff --git a/plugins/org.polarsys.chess.core/unused/CreateCHESSModelCommand.java b/plugins/org.polarsys.chess.core/unused/CreateCHESSModelCommand.java
index 5843569..dc6fb58 100644
--- a/plugins/org.polarsys.chess.core/unused/CreateCHESSModelCommand.java
+++ b/plugins/org.polarsys.chess.core/unused/CreateCHESSModelCommand.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/unused/NewCHESSModelCommand.java b/plugins/org.polarsys.chess.core/unused/NewCHESSModelCommand.java
index c46d904..0105c3e 100644
--- a/plugins/org.polarsys.chess.core/unused/NewCHESSModelCommand.java
+++ b/plugins/org.polarsys.chess.core/unused/NewCHESSModelCommand.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/unused/annotations/DynamicConstraint.java b/plugins/org.polarsys.chess.core/unused/annotations/DynamicConstraint.java
index 5347e41..c952822 100644
--- a/plugins/org.polarsys.chess.core/unused/annotations/DynamicConstraint.java
+++ b/plugins/org.polarsys.chess.core/unused/annotations/DynamicConstraint.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/unused/annotations/DynamicConstraintLib.java b/plugins/org.polarsys.chess.core/unused/annotations/DynamicConstraintLib.java
index 659f29d..b2655b4 100644
--- a/plugins/org.polarsys.chess.core/unused/annotations/DynamicConstraintLib.java
+++ b/plugins/org.polarsys.chess.core/unused/annotations/DynamicConstraintLib.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/unused/annotations/DynamicConstraintProcessor.java b/plugins/org.polarsys.chess.core/unused/annotations/DynamicConstraintProcessor.java
index 32dc2f9..b35616d 100644
--- a/plugins/org.polarsys.chess.core/unused/annotations/DynamicConstraintProcessor.java
+++ b/plugins/org.polarsys.chess.core/unused/annotations/DynamicConstraintProcessor.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/unused/annotations/IEl.java b/plugins/org.polarsys.chess.core/unused/annotations/IEl.java
index 0aefe59..2a21c3e 100644
--- a/plugins/org.polarsys.chess.core/unused/annotations/IEl.java
+++ b/plugins/org.polarsys.chess.core/unused/annotations/IEl.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.core/unused/annotations/LibExample.java b/plugins/org.polarsys.chess.core/unused/annotations/LibExample.java
index 003eda5..03f2982 100644
--- a/plugins/org.polarsys.chess.core/unused/annotations/LibExample.java
+++ b/plugins/org.polarsys.chess.core/unused/annotations/LibExample.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.diagram.ui/about.html b/plugins/org.polarsys.chess.diagram.ui/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/plugins/org.polarsys.chess.diagram.ui/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/commands/ExportComponentToImageCommand.java b/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/commands/ExportComponentToImageCommand.java
index 05f308e..6057744 100644
--- a/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/commands/ExportComponentToImageCommand.java
+++ b/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/commands/ExportComponentToImageCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/commands/ExportModelToDocumentCommand.java b/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/commands/ExportModelToDocumentCommand.java
index f9b189e..3c90e09 100644
--- a/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/commands/ExportModelToDocumentCommand.java
+++ b/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/commands/ExportModelToDocumentCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/commands/GenerateDocumentCommand.java b/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/commands/GenerateDocumentCommand.java
index 99dfea9..0fb1c5e 100644
--- a/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/commands/GenerateDocumentCommand.java
+++ b/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/commands/GenerateDocumentCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/docGenerators/CHESSBlockDefinitionDiagramModel.java b/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/docGenerators/CHESSBlockDefinitionDiagramModel.java
index 504dfff..f26a64e 100644
--- a/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/docGenerators/CHESSBlockDefinitionDiagramModel.java
+++ b/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/docGenerators/CHESSBlockDefinitionDiagramModel.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/docGenerators/CHESSInternalBlockDiagramModel.java b/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/docGenerators/CHESSInternalBlockDiagramModel.java
index 465d5ce..47d49ac 100644
--- a/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/docGenerators/CHESSInternalBlockDiagramModel.java
+++ b/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/docGenerators/CHESSInternalBlockDiagramModel.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/services/CHESSDiagramsGeneratorService.java b/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/services/CHESSDiagramsGeneratorService.java
index b901189..4aa0553 100644
--- a/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/services/CHESSDiagramsGeneratorService.java
+++ b/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/services/CHESSDiagramsGeneratorService.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/services/ResultsGeneratorService.java b/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/services/ResultsGeneratorService.java
index 65cfd61..ae5d11e 100644
--- a/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/services/ResultsGeneratorService.java
+++ b/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/services/ResultsGeneratorService.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/utils/ExportDialogUtils.java b/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/utils/ExportDialogUtils.java
index 183e3ed..3ea4271 100644
--- a/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/utils/ExportDialogUtils.java
+++ b/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/utils/ExportDialogUtils.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.diagramsCreator/about.html b/plugins/org.polarsys.chess.diagramsCreator/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/plugins/org.polarsys.chess.diagramsCreator/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/actions/ShowBDDElementsAction.java b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/actions/ShowBDDElementsAction.java
index 3e800cb..639a5fb 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/actions/ShowBDDElementsAction.java
+++ b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/actions/ShowBDDElementsAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/actions/ShowIBDElementsAction.java b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/actions/ShowIBDElementsAction.java
index f56e935..344859f 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/actions/ShowIBDElementsAction.java
+++ b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/actions/ShowIBDElementsAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/actions/ShowSMDElementsAction.java b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/actions/ShowSMDElementsAction.java
index 1d552fe..abe3217 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/actions/ShowSMDElementsAction.java
+++ b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/actions/ShowSMDElementsAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/AdjustAssociationsHandler.java b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/AdjustAssociationsHandler.java
index a894762..44305a7 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/AdjustAssociationsHandler.java
+++ b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/AdjustAssociationsHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/AdjustConnectorsHandler.java b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/AdjustConnectorsHandler.java
index 26ec95f..d0abef0 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/AdjustConnectorsHandler.java
+++ b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/AdjustConnectorsHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/ArrangeHandler.java b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/ArrangeHandler.java
index 0ff0d9c..a4c72f4 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/ArrangeHandler.java
+++ b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/ArrangeHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/CreateBDDCommand.java b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/CreateBDDCommand.java
index 91ece7f..2061f7b 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/CreateBDDCommand.java
+++ b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/CreateBDDCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/CreateBDDHandler.java b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/CreateBDDHandler.java
index 723bc22..78d02c1 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/CreateBDDHandler.java
+++ b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/CreateBDDHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/CreateIBDMultipleCommand.java b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/CreateIBDMultipleCommand.java
index d83c1bd..3c58765 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/CreateIBDMultipleCommand.java
+++ b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/CreateIBDMultipleCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/CreateIBDMultipleHandler.java b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/CreateIBDMultipleHandler.java
index 4bf84bf..2d16c6e 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/CreateIBDMultipleHandler.java
+++ b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/CreateIBDMultipleHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/CreateIBDSingleCommand.java b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/CreateIBDSingleCommand.java
index aba8150..570d977 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/CreateIBDSingleCommand.java
+++ b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/CreateIBDSingleCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/CreateIBDSingleHandler.java b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/CreateIBDSingleHandler.java
index de9acf8..e74dce7 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/CreateIBDSingleHandler.java
+++ b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/CreateIBDSingleHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/CreateSMDHandler.java b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/CreateSMDHandler.java
index d51efed..8da254c 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/CreateSMDHandler.java
+++ b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/CreateSMDHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
  * Contributors:
  *   Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/RefreshBDDHandler.java b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/RefreshBDDHandler.java
index 49ec7e5..19c6397 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/RefreshBDDHandler.java
+++ b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/RefreshBDDHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
  * Contributors:
  *   Alberto Debiasi - initial API and implementation
diff --git a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/RefreshIBDHandler.java b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/RefreshIBDHandler.java
index 5d0a1e0..fa65f54 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/RefreshIBDHandler.java
+++ b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/RefreshIBDHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
  * Contributors:
  *   Alberto Debiasi - initial API and implementation
diff --git a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/RefreshSMDHandler.java b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/RefreshSMDHandler.java
index 40a769b..a67a475 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/RefreshSMDHandler.java
+++ b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/commands/RefreshSMDHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
  * Contributors:
  *   Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/connectors/BDDDiagramLayoutConnector.java b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/connectors/BDDDiagramLayoutConnector.java
index 5cdc1cf..1ec4af5 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/connectors/BDDDiagramLayoutConnector.java
+++ b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/connectors/BDDDiagramLayoutConnector.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/connectors/IBDDiagramLayoutConnector.java b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/connectors/IBDDiagramLayoutConnector.java
index 1fd3486..452c4d1 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/connectors/IBDDiagramLayoutConnector.java
+++ b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/connectors/IBDDiagramLayoutConnector.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/connectors/SMDDiagramLayoutConnector.java b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/connectors/SMDDiagramLayoutConnector.java
index 01b3948..11604d0 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/connectors/SMDDiagramLayoutConnector.java
+++ b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/connectors/SMDDiagramLayoutConnector.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/dialogs/BDDCreatorDialog.java b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/dialogs/BDDCreatorDialog.java
index 8f288d9..9e2de2f 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/dialogs/BDDCreatorDialog.java
+++ b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/dialogs/BDDCreatorDialog.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2018 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *  

  * Contributors:

  *     Luca Cristoforetti - initial API and implementation

diff --git a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/dialogs/IBDCreatorDialog.java b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/dialogs/IBDCreatorDialog.java
index ec8cb06..50700e3 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/dialogs/IBDCreatorDialog.java
+++ b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/dialogs/IBDCreatorDialog.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2018 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *  

  * Contributors:

  *     Luca Cristoforetti - initial API and implementation

diff --git a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/layouts/BDDLayoutSetup.java b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/layouts/BDDLayoutSetup.java
index c4dd0cf..09b0ea8 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/layouts/BDDLayoutSetup.java
+++ b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/layouts/BDDLayoutSetup.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/layouts/IBDLayoutSetup.java b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/layouts/IBDLayoutSetup.java
index 7aec655..b5d9b65 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/layouts/IBDLayoutSetup.java
+++ b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/layouts/IBDLayoutSetup.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/layouts/SMDLayoutSetup.java b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/layouts/SMDLayoutSetup.java
index 52d97b7..855e3ce 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/layouts/SMDLayoutSetup.java
+++ b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/layouts/SMDLayoutSetup.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/utils/DiagramUtils.java b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/utils/DiagramUtils.java
index 1e7dc63..03e29d3 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/utils/DiagramUtils.java
+++ b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/utils/DiagramUtils.java
@@ -1,3 +1,10 @@
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

 package org.polarsys.chess.diagramsCreator.utils;

 

 import java.util.ArrayList;

diff --git a/plugins/org.polarsys.chess.discovery/about.html b/plugins/org.polarsys.chess.discovery/about.html
index dd3c089..164f781 100644
--- a/plugins/org.polarsys.chess.discovery/about.html
+++ b/plugins/org.polarsys.chess.discovery/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>November 14, 2008</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.discovery/src/org/polarsys/chess/discovery/Activator.java b/plugins/org.polarsys.chess.discovery/src/org/polarsys/chess/discovery/Activator.java
index bb7c7c8..2cc54dc 100644
--- a/plugins/org.polarsys.chess.discovery/src/org/polarsys/chess/discovery/Activator.java
+++ b/plugins/org.polarsys.chess.discovery/src/org/polarsys/chess/discovery/Activator.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * 
  * Contributors:
diff --git a/plugins/org.polarsys.chess.discovery/src/org/polarsys/chess/discovery/ui/menu/handler/CHESSDiscoveryAction.java b/plugins/org.polarsys.chess.discovery/src/org/polarsys/chess/discovery/ui/menu/handler/CHESSDiscoveryAction.java
index d85e992..0852a8a 100644
--- a/plugins/org.polarsys.chess.discovery/src/org/polarsys/chess/discovery/ui/menu/handler/CHESSDiscoveryAction.java
+++ b/plugins/org.polarsys.chess.discovery/src/org/polarsys/chess/discovery/ui/menu/handler/CHESSDiscoveryAction.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *  Alessandro Zovi
diff --git a/plugins/org.polarsys.chess.discovery/src/org/polarsys/chess/discovery/ui/menu/handler/CHESSDiscoveryHandler.java b/plugins/org.polarsys.chess.discovery/src/org/polarsys/chess/discovery/ui/menu/handler/CHESSDiscoveryHandler.java
index b2619ec..c817922 100644
--- a/plugins/org.polarsys.chess.discovery/src/org/polarsys/chess/discovery/ui/menu/handler/CHESSDiscoveryHandler.java
+++ b/plugins/org.polarsys.chess.discovery/src/org/polarsys/chess/discovery/ui/menu/handler/CHESSDiscoveryHandler.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *  Alessandro Zovi
diff --git a/plugins/org.polarsys.chess.discovery/src/org/polarsys/chess/discovery/ui/wizards/DiscoveryComponent.java b/plugins/org.polarsys.chess.discovery/src/org/polarsys/chess/discovery/ui/wizards/DiscoveryComponent.java
index 79f3e66..62e84e2 100644
--- a/plugins/org.polarsys.chess.discovery/src/org/polarsys/chess/discovery/ui/wizards/DiscoveryComponent.java
+++ b/plugins/org.polarsys.chess.discovery/src/org/polarsys/chess/discovery/ui/wizards/DiscoveryComponent.java
@@ -3,9 +3,9 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *  Alessandro Zovi
diff --git a/plugins/org.polarsys.chess.functionBehaviors.functionBehaviorEditor/about.html b/plugins/org.polarsys.chess.functionBehaviors.functionBehaviorEditor/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/plugins/org.polarsys.chess.functionBehaviors.functionBehaviorEditor/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.functionBehaviors.functionBehaviorEditor/src/org/polarsys/chess/functionBehaviors/functionBehaviorEditor/StartupClass.java b/plugins/org.polarsys.chess.functionBehaviors.functionBehaviorEditor/src/org/polarsys/chess/functionBehaviors/functionBehaviorEditor/StartupClass.java
index 1fdc0e3..a9060a7 100644
--- a/plugins/org.polarsys.chess.functionBehaviors.functionBehaviorEditor/src/org/polarsys/chess/functionBehaviors/functionBehaviorEditor/StartupClass.java
+++ b/plugins/org.polarsys.chess.functionBehaviors.functionBehaviorEditor/src/org/polarsys/chess/functionBehaviors/functionBehaviorEditor/StartupClass.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.instance.view/about.html b/plugins/org.polarsys.chess.instance.view/about.html
index dd3c089..164f781 100644
--- a/plugins/org.polarsys.chess.instance.view/about.html
+++ b/plugins/org.polarsys.chess.instance.view/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>November 14, 2008</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.m2m/about.html b/plugins/org.polarsys.chess.m2m/about.html
index dd3c089..164f781 100644
--- a/plugins/org.polarsys.chess.m2m/about.html
+++ b/plugins/org.polarsys.chess.m2m/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>November 14, 2008</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.m2m/license/Copyright-CeilingCalculator.txt b/plugins/org.polarsys.chess.m2m/license/Copyright-CeilingCalculator.txt
index 626dd9c..8ece7c7 100644
--- a/plugins/org.polarsys.chess.m2m/license/Copyright-CeilingCalculator.txt
+++ b/plugins/org.polarsys.chess.m2m/license/Copyright-CeilingCalculator.txt
@@ -9,6 +9,6 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 
diff --git a/plugins/org.polarsys.chess.m2m/license/Copyright.txt b/plugins/org.polarsys.chess.m2m/license/Copyright.txt
index 849e834..f65272b 100644
--- a/plugins/org.polarsys.chess.m2m/license/Copyright.txt
+++ b/plugins/org.polarsys.chess.m2m/license/Copyright.txt
@@ -9,5 +9,5 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
diff --git a/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/Activator.java b/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/Activator.java
index d520a72..af19f05 100644
--- a/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/Activator.java
+++ b/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/Activator.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 package org.polarsys.chess.m2m;
diff --git a/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/backpropagation/BackpropagationFullVERDE.java b/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/backpropagation/BackpropagationFullVERDE.java
index 81dc919..04b6fda 100644
--- a/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/backpropagation/BackpropagationFullVERDE.java
+++ b/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/backpropagation/BackpropagationFullVERDE.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/blackbox/Java4QVTutils.java b/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/blackbox/Java4QVTutils.java
index cd8166a..6c1924e 100644
--- a/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/blackbox/Java4QVTutils.java
+++ b/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/blackbox/Java4QVTutils.java
@@ -3,9 +3,9 @@
  *  *
  *  *    
  *  * All rights reserved. This program and the accompanying materials
- *  * are made available under the terms of the Eclipse Public License v1.0
+ *  * are made available under the terms of the Eclipse Public License v2.0
  *  * which accompanies this distribution, and is available at
- *  * http://www.eclipse.org/legal/epl-v10.html
+ *  * http://www.eclipse.org/legal/epl-v20.html
  *  *
  *******************************************************************************/
 package org.polarsys.chess.m2m.blackbox;
diff --git a/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/blackbox/VSLUtils.java b/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/blackbox/VSLUtils.java
index a9118ae..c786ea0 100644
--- a/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/blackbox/VSLUtils.java
+++ b/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/blackbox/VSLUtils.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 
diff --git a/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/handlers/CompareAnalysisResultsHandler.java b/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/handlers/CompareAnalysisResultsHandler.java
index 98e5fa4..1578e50 100644
--- a/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/handlers/CompareAnalysisResultsHandler.java
+++ b/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/handlers/CompareAnalysisResultsHandler.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Laura Baracchi  laura.baracchi@intecs.it  - initial API and implementation and/or initial documentation
diff --git a/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/handlers/PurgePSMHandler.java b/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/handlers/PurgePSMHandler.java
index ef00ce1..f27f0d6 100644
--- a/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/handlers/PurgePSMHandler.java
+++ b/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/handlers/PurgePSMHandler.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/handlers/QVToUIHandlerEnd2End.java b/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/handlers/QVToUIHandlerEnd2End.java
index 39f915a..cc2cac3 100644
--- a/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/handlers/QVToUIHandlerEnd2End.java
+++ b/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/handlers/QVToUIHandlerEnd2End.java
@@ -11,7 +11,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/handlers/QVToUIHandlerVERDE.java b/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/handlers/QVToUIHandlerVERDE.java
index 1f7857f..8852231 100644
--- a/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/handlers/QVToUIHandlerVERDE.java
+++ b/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/handlers/QVToUIHandlerVERDE.java
@@ -11,7 +11,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 
diff --git a/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/transformations/PIMPSMTransformationVERDE.java b/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/transformations/PIMPSMTransformationVERDE.java
index dfcbcd3..94fcf1e 100644
--- a/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/transformations/PIMPSMTransformationVERDE.java
+++ b/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/transformations/PIMPSMTransformationVERDE.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/transformations/QVToTransformation.java b/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/transformations/QVToTransformation.java
index 4136c99..6a610ec 100644
--- a/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/transformations/QVToTransformation.java
+++ b/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/transformations/QVToTransformation.java
@@ -10,7 +10,7 @@
 -- 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                         --

+-- http://www.eclipse.org/legal/epl-v20.html                         --

 -----------------------------------------------------------------------

  */

 

diff --git a/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/transformations/TransUtil.java b/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/transformations/TransUtil.java
index 5741070..f4c5047 100644
--- a/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/transformations/TransUtil.java
+++ b/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/transformations/TransUtil.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/ui/CompareSchedResultDialog.java b/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/ui/CompareSchedResultDialog.java
index 5fb7aca..7a79aa7 100644
--- a/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/ui/CompareSchedResultDialog.java
+++ b/plugins/org.polarsys.chess.m2m/src/org/polarsys/chess/m2m/ui/CompareSchedResultDialog.java
@@ -2,9 +2,9 @@
  *
  * Copyright (c) 2015 Intecs SpA 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * Laura Baracchi  laura.baracchi@intecs.it  - initial API and implementation and/or initial documentation
diff --git a/plugins/org.polarsys.chess.m2m/transformations/BuildMultiInstance.qvto b/plugins/org.polarsys.chess.m2m/transformations/BuildMultiInstance.qvto
index 55c15bb..e64bea9 100644
--- a/plugins/org.polarsys.chess.m2m/transformations/BuildMultiInstance.qvto
+++ b/plugins/org.polarsys.chess.m2m/transformations/BuildMultiInstance.qvto
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.m2m/transformations/CHESS_CeilingAssignment.qvto b/plugins/org.polarsys.chess.m2m/transformations/CHESS_CeilingAssignment.qvto
index df04815..7083324 100644
--- a/plugins/org.polarsys.chess.m2m/transformations/CHESS_CeilingAssignment.qvto
+++ b/plugins/org.polarsys.chess.m2m/transformations/CHESS_CeilingAssignment.qvto
@@ -11,7 +11,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.m2m/transformations/CHESS_PIM2PSM_Inst_full_VERDE.qvto b/plugins/org.polarsys.chess.m2m/transformations/CHESS_PIM2PSM_Inst_full_VERDE.qvto
index ec891ee..142c406 100644
--- a/plugins/org.polarsys.chess.m2m/transformations/CHESS_PIM2PSM_Inst_full_VERDE.qvto
+++ b/plugins/org.polarsys.chess.m2m/transformations/CHESS_PIM2PSM_Inst_full_VERDE.qvto
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 --																	 --
 -- 20150114: SP change in getLifeLineInstance to avoid trouble       -- 
 -- in case of an InstanceSpecification whose name is a substring of  --
diff --git a/plugins/org.polarsys.chess.m2m/transformations/CHESS_PIM2PSM_Inst_full_VERDE_RUN.qvto b/plugins/org.polarsys.chess.m2m/transformations/CHESS_PIM2PSM_Inst_full_VERDE_RUN.qvto
index caa217c..5872d9b 100644
--- a/plugins/org.polarsys.chess.m2m/transformations/CHESS_PIM2PSM_Inst_full_VERDE_RUN.qvto
+++ b/plugins/org.polarsys.chess.m2m/transformations/CHESS_PIM2PSM_Inst_full_VERDE_RUN.qvto
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 --																	 --
 -- 20150114: SP change in getLifeLineInstance to avoid trouble       -- 
 -- in case of an InstanceSpecification whose name is a substring of  --
diff --git a/plugins/org.polarsys.chess.m2m/transformations/MARTEUtils.qvto b/plugins/org.polarsys.chess.m2m/transformations/MARTEUtils.qvto
index de94ec9..3c3321a 100644
--- a/plugins/org.polarsys.chess.m2m/transformations/MARTEUtils.qvto
+++ b/plugins/org.polarsys.chess.m2m/transformations/MARTEUtils.qvto
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.m2m/transformations/ProfileUtils_Inst_full.qvto b/plugins/org.polarsys.chess.m2m/transformations/ProfileUtils_Inst_full.qvto
index d0f3d2d..a1f1493 100644
--- a/plugins/org.polarsys.chess.m2m/transformations/ProfileUtils_Inst_full.qvto
+++ b/plugins/org.polarsys.chess.m2m/transformations/ProfileUtils_Inst_full.qvto
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.m2m/transformations/RemoveMultiInstance.qvto b/plugins/org.polarsys.chess.m2m/transformations/RemoveMultiInstance.qvto
index e1bcf2f..41b1905 100644
--- a/plugins/org.polarsys.chess.m2m/transformations/RemoveMultiInstance.qvto
+++ b/plugins/org.polarsys.chess.m2m/transformations/RemoveMultiInstance.qvto
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.m2m/transformations/UMLUtils_Inst_full.qvto b/plugins/org.polarsys.chess.m2m/transformations/UMLUtils_Inst_full.qvto
index 737861e..fe440d0 100644
--- a/plugins/org.polarsys.chess.m2m/transformations/UMLUtils_Inst_full.qvto
+++ b/plugins/org.polarsys.chess.m2m/transformations/UMLUtils_Inst_full.qvto
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.m2m/transformations/Unused.qvto b/plugins/org.polarsys.chess.m2m/transformations/Unused.qvto
index ee521ad..974450a 100644
--- a/plugins/org.polarsys.chess.m2m/transformations/Unused.qvto
+++ b/plugins/org.polarsys.chess.m2m/transformations/Unused.qvto
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.mainmenu/about.html b/plugins/org.polarsys.chess.mainmenu/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/plugins/org.polarsys.chess.mainmenu/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.monitoring.edit/about.html b/plugins/org.polarsys.chess.monitoring.edit/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/plugins/org.polarsys.chess.monitoring.edit/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.monitoring.editor/about.html b/plugins/org.polarsys.chess.monitoring.editor/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/plugins/org.polarsys.chess.monitoring.editor/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.monitoring.tests/about.html b/plugins/org.polarsys.chess.monitoring.tests/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/plugins/org.polarsys.chess.monitoring.tests/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.monitoring/about.html b/plugins/org.polarsys.chess.monitoring/about.html
index dd3c089..164f781 100644
--- a/plugins/org.polarsys.chess.monitoring/about.html
+++ b/plugins/org.polarsys.chess.monitoring/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>November 14, 2008</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/Activator.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/Activator.java
index ff3cfef..680b3b2 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/Activator.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/Activator.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
   */  
 
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/AnalysisContext.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/AnalysisContext.java
index 29ab72c..97a099c 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/AnalysisContext.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/AnalysisContext.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
   */  
 package org.polarsys.chess.monitoring.monitoringxml;
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/BlockingTime.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/BlockingTime.java
index 3381281..e621226 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/BlockingTime.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/BlockingTime.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
   */  
 package org.polarsys.chess.monitoring.monitoringxml;
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/ExecutionTime.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/ExecutionTime.java
index 7c952ad..da9153a 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/ExecutionTime.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/ExecutionTime.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
   */  
 package org.polarsys.chess.monitoring.monitoringxml;
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/MeasuredValue.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/MeasuredValue.java
index a969e05..c9f9971 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/MeasuredValue.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/MeasuredValue.java
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
   */ 
 package org.polarsys.chess.monitoring.monitoringxml;
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/MonitoredResource.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/MonitoredResource.java
index 5ba62af..459971c 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/MonitoredResource.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/MonitoredResource.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
   */ 
 package org.polarsys.chess.monitoring.monitoringxml;
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/Monitoring.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/Monitoring.java
index 7d2ffd2..4abe91c 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/Monitoring.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/Monitoring.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
   */ 
 package org.polarsys.chess.monitoring.monitoringxml;
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/MonitoringxmlFactory.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/MonitoringxmlFactory.java
index f0fbc1f..17601d8 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/MonitoringxmlFactory.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/MonitoringxmlFactory.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
   */ 
 package org.polarsys.chess.monitoring.monitoringxml;
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/MonitoringxmlPackage.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/MonitoringxmlPackage.java
index be9e5dd..d5385c2 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/MonitoringxmlPackage.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/MonitoringxmlPackage.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
   */ 
 package org.polarsys.chess.monitoring.monitoringxml;
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/Period.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/Period.java
index 2cd3cbc..2dfbd1e 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/Period.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/Period.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
   */ 
 package org.polarsys.chess.monitoring.monitoringxml;
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/Resource.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/Resource.java
index 4d1dce0..40b9dd1 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/Resource.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/Resource.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
   */ 
 package org.polarsys.chess.monitoring.monitoringxml;
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/ResponseTime.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/ResponseTime.java
index 9ebcf17..121e0e8 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/ResponseTime.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/ResponseTime.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
   */ 
 package org.polarsys.chess.monitoring.monitoringxml;
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/Thread.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/Thread.java
index c7eea79..c84ecb3 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/Thread.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/Thread.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
   */ 
 package org.polarsys.chess.monitoring.monitoringxml;
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/AnalysisContextImpl.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/AnalysisContextImpl.java
index 84ba3a1..558c3ba 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/AnalysisContextImpl.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/AnalysisContextImpl.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
   */ 
 package org.polarsys.chess.monitoring.monitoringxml.impl;
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/BlockingTimeImpl.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/BlockingTimeImpl.java
index 67f469f..c50354b 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/BlockingTimeImpl.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/BlockingTimeImpl.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
   */ 
 package org.polarsys.chess.monitoring.monitoringxml.impl;
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/ExecutionTimeImpl.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/ExecutionTimeImpl.java
index 2d0ffbb..fa3ad75 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/ExecutionTimeImpl.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/ExecutionTimeImpl.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
   */ 
 package org.polarsys.chess.monitoring.monitoringxml.impl;
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/MeasuredValueImpl.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/MeasuredValueImpl.java
index 4e5f729..0fcc2d4 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/MeasuredValueImpl.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/MeasuredValueImpl.java
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
   */ 
 package org.polarsys.chess.monitoring.monitoringxml.impl;
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/MonitoredResourceImpl.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/MonitoredResourceImpl.java
index 35dd530..b01259d 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/MonitoredResourceImpl.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/MonitoredResourceImpl.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
   */ 
 package org.polarsys.chess.monitoring.monitoringxml.impl;
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/MonitoringImpl.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/MonitoringImpl.java
index a78132a..4f29ca9 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/MonitoringImpl.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/MonitoringImpl.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
   */ 
 package org.polarsys.chess.monitoring.monitoringxml.impl;
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/MonitoringxmlFactoryImpl.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/MonitoringxmlFactoryImpl.java
index 7d24cbf..85a21c1 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/MonitoringxmlFactoryImpl.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/MonitoringxmlFactoryImpl.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
   */ 
 package org.polarsys.chess.monitoring.monitoringxml.impl;
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/PeriodImpl.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/PeriodImpl.java
index 2cfa75a..5d1f9f5 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/PeriodImpl.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/PeriodImpl.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
   */ 
 package org.polarsys.chess.monitoring.monitoringxml.impl;
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/ResourceImpl.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/ResourceImpl.java
index e0ceb54..fe26beb 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/ResourceImpl.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/ResourceImpl.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
   */ 
 package org.polarsys.chess.monitoring.monitoringxml.impl;
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/ResponseTimeImpl.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/ResponseTimeImpl.java
index 3d2f0f1..a9a2f16 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/ResponseTimeImpl.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/ResponseTimeImpl.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
   */ 
 package org.polarsys.chess.monitoring.monitoringxml.impl;
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/ThreadImpl.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/ThreadImpl.java
index 08c5e07..31a5ac5 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/ThreadImpl.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/impl/ThreadImpl.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
   */ 
 package org.polarsys.chess.monitoring.monitoringxml.impl;
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/popup/actions/ImportLogHandler.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/popup/actions/ImportLogHandler.java
index f3a68eb..fce3c98 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/popup/actions/ImportLogHandler.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/popup/actions/ImportLogHandler.java
@@ -9,7 +9,7 @@
 -- 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                         --

+-- http://www.eclipse.org/legal/epl-v20.html                         --

 -----------------------------------------------------------------------

   */ 

 

diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/popup/actions/LaunchBackpropagation.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/popup/actions/LaunchBackpropagation.java
index d8aa5aa..7a78d0e 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/popup/actions/LaunchBackpropagation.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/popup/actions/LaunchBackpropagation.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
   */ 
 
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/popup/actions/LaunchTraceAnalysis.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/popup/actions/LaunchTraceAnalysis.java
index b1c2269..60a2273 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/popup/actions/LaunchTraceAnalysis.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/popup/actions/LaunchTraceAnalysis.java
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
   */ 
 
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/util/MonitoringxmlAdapterFactory.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/util/MonitoringxmlAdapterFactory.java
index 0d715b4..254bca9 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/util/MonitoringxmlAdapterFactory.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/util/MonitoringxmlAdapterFactory.java
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
   */ 
 package org.polarsys.chess.monitoring.monitoringxml.util;
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/util/MonitoringxmlResourceFactoryImpl.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/util/MonitoringxmlResourceFactoryImpl.java
index b8256ca..f150950 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/util/MonitoringxmlResourceFactoryImpl.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/util/MonitoringxmlResourceFactoryImpl.java
@@ -8,7 +8,7 @@
  *  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
+ *  http://www.eclipse.org/legal/epl-v20.html
  *******************************************************************************/
 /**
  */
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/util/MonitoringxmlResourceImpl.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/util/MonitoringxmlResourceImpl.java
index 5602b47..5c4ef5c 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/util/MonitoringxmlResourceImpl.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/util/MonitoringxmlResourceImpl.java
@@ -8,7 +8,7 @@
  *  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
+ *  http://www.eclipse.org/legal/epl-v20.html
  *******************************************************************************/
 
 package org.polarsys.chess.monitoring.monitoringxml.util;
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/util/MonitoringxmlSwitch.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/util/MonitoringxmlSwitch.java
index f825c0c..deeccfd 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/util/MonitoringxmlSwitch.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/monitoringxml/util/MonitoringxmlSwitch.java
@@ -8,7 +8,7 @@
  *  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
+ *  http://www.eclipse.org/legal/epl-v20.html
  *******************************************************************************/
 package org.polarsys.chess.monitoring.monitoringxml.util;
 
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/preferences/MonitoringPreferencePage.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/preferences/MonitoringPreferencePage.java
index d55cd39..02160a1 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/preferences/MonitoringPreferencePage.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/preferences/MonitoringPreferencePage.java
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
   */ 
 
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/preferences/PreferenceConstants.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/preferences/PreferenceConstants.java
index d210d13..7b8cc01 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/preferences/PreferenceConstants.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/preferences/PreferenceConstants.java
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
   */ 
 
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/preferences/PreferenceInitializer.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/preferences/PreferenceInitializer.java
index f9aef83..17820a8 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/preferences/PreferenceInitializer.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/preferences/PreferenceInitializer.java
@@ -9,7 +9,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
   */ 
 
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/traceanalyser/Event.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/traceanalyser/Event.java
index 51a8f59..938efdf 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/traceanalyser/Event.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/traceanalyser/Event.java
@@ -8,7 +8,7 @@
  *  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
+ *  http://www.eclipse.org/legal/epl-v20.html
  *******************************************************************************/
 
 package org.polarsys.chess.monitoring.traceanalyser;
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/traceanalyser/EventType.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/traceanalyser/EventType.java
index 5aaf56c..952e2d1 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/traceanalyser/EventType.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/traceanalyser/EventType.java
@@ -8,7 +8,7 @@
  *  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
+ *  http://www.eclipse.org/legal/epl-v20.html
  *******************************************************************************/
 
 package org.polarsys.chess.monitoring.traceanalyser;
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/traceanalyser/Parameters.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/traceanalyser/Parameters.java
index 1f25a93..e706a27 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/traceanalyser/Parameters.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/traceanalyser/Parameters.java
@@ -8,7 +8,7 @@
  *  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
+ *  http://www.eclipse.org/legal/epl-v20.html
  *******************************************************************************/
 
 package org.polarsys.chess.monitoring.traceanalyser;
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/traceanalyser/ThreadEvents.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/traceanalyser/ThreadEvents.java
index c94618c..5f723b9 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/traceanalyser/ThreadEvents.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/traceanalyser/ThreadEvents.java
@@ -8,7 +8,7 @@
  *  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
+ *  http://www.eclipse.org/legal/epl-v20.html
  *******************************************************************************/
 
 package org.polarsys.chess.monitoring.traceanalyser;
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/traceanalyser/TraceAnalyser.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/traceanalyser/TraceAnalyser.java
index a611f1a..f52a09a 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/traceanalyser/TraceAnalyser.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/traceanalyser/TraceAnalyser.java
@@ -8,7 +8,7 @@
  *  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
+ *  http://www.eclipse.org/legal/epl-v20.html
  *******************************************************************************/
 
 package org.polarsys.chess.monitoring.traceanalyser;
diff --git a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/traceanalyser/TraceReader.java b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/traceanalyser/TraceReader.java
index 70e85a5..e813047 100644
--- a/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/traceanalyser/TraceReader.java
+++ b/plugins/org.polarsys.chess.monitoring/src/org/polarsys/chess/monitoring/traceanalyser/TraceReader.java
@@ -8,7 +8,7 @@
  *  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
+ *  http://www.eclipse.org/legal/epl-v20.html
  *******************************************************************************/
 
 package org.polarsys.chess.monitoring.traceanalyser;
diff --git a/plugins/org.polarsys.chess.monitoring/transforms/CommonUtilities.qvto b/plugins/org.polarsys.chess.monitoring/transforms/CommonUtilities.qvto
index ce1d74d..d42e2e4 100644
--- a/plugins/org.polarsys.chess.monitoring/transforms/CommonUtilities.qvto
+++ b/plugins/org.polarsys.chess.monitoring/transforms/CommonUtilities.qvto
@@ -8,7 +8,7 @@
  *  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
+ *  http://www.eclipse.org/legal/epl-v20.html
  *******************************************************************************/
 
 modeltype chess uses 'http://CHESS';
diff --git a/plugins/org.polarsys.chess.monitoring/transforms/MonitoringXML2Chess.qvto b/plugins/org.polarsys.chess.monitoring/transforms/MonitoringXML2Chess.qvto
index fe13ebb..e55a1c3 100644
--- a/plugins/org.polarsys.chess.monitoring/transforms/MonitoringXML2Chess.qvto
+++ b/plugins/org.polarsys.chess.monitoring/transforms/MonitoringXML2Chess.qvto
@@ -7,7 +7,7 @@
  *  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
+ *  http://www.eclipse.org/legal/epl-v20.html
  *******************************************************************************/
 
 import CommonUtilities;
diff --git a/plugins/org.polarsys.chess.multicore/about.html b/plugins/org.polarsys.chess.multicore/about.html
index dd3c089..164f781 100644
--- a/plugins/org.polarsys.chess.multicore/about.html
+++ b/plugins/org.polarsys.chess.multicore/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>November 14, 2008</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/Activator.java b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/Activator.java
index 06e55d7..9a6bad8 100644
--- a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/Activator.java
+++ b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/Activator.java
@@ -1,69 +1,76 @@
-/*------------------------------------------------------------------------------
-  -
-  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 
-  - 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:
-  -
-  - Alessandro Zovi azovi@math.unipd.it
-  - Stefano Puri stefano.puri@intecs.it
-  - Laura Baracchi laura.baracchi@intecs.it
-  - Nicholas Pacini nicholas.pacini@intecs.it  
-  -
-  - Initial API and implementation and/or initial documentation
-  ------------------------------------------------------------------------------*/
-package org.polarsys.chess.multicore;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle.
- */
-public class Activator extends AbstractUIPlugin {
-
-	/** The Constant PLUGIN_ID. */
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.polarsys.chess.multicore"; //$NON-NLS-1$
-
-	/** The plugin. */
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor.
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance.
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+/*------------------------------------------------------------------------------

+  -

+  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 

+  - All rights reserved. This program and the accompanying materials

+  - are made available under the terms of the Eclipse Public License v2.0

+  - which accompanies this distribution, and is available at

+  - http://www.eclipse.org/legal/epl-v20.html

+  -

+  - Contributors:

+  -

+  - Alessandro Zovi azovi@math.unipd.it

+  - Stefano Puri stefano.puri@intecs.it

+  - Laura Baracchi laura.baracchi@intecs.it

+  - Nicholas Pacini nicholas.pacini@intecs.it  

+  -

+  - Initial API and implementation and/or initial documentation

+  ------------------------------------------------------------------------------*/

+package org.polarsys.chess.multicore;

+

+import org.eclipse.ui.plugin.AbstractUIPlugin;

+import org.osgi.framework.BundleContext;

+

+/**

+ * The activator class controls the plug-in life cycle.

+ */

+public class Activator extends AbstractUIPlugin {

+

+	/** The Constant PLUGIN_ID. */

+	// The plug-in ID

+	public static final String PLUGIN_ID = "org.polarsys.chess.multicore"; //$NON-NLS-1$

+

+	/** The plugin. */

+	// The shared instance

+	private static Activator plugin;

+	

+	/**

+	 * The constructor.

+	 */

+	public Activator() {

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

+	 */

+	public void start(BundleContext context) throws Exception {

+		super.start(context);

+		plugin = this;

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

+	 */

+	public void stop(BundleContext context) throws Exception {

+		plugin = null;

+		super.stop(context);

+	}

+

+	/**

+	 * Returns the shared instance.

+	 *

+	 * @return the shared instance

+	 */

+	public static Activator getDefault() {

+		return plugin;

+	}

+

+}

diff --git a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/ReferenceSelectorNoDoubleClick.java b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/ReferenceSelectorNoDoubleClick.java
index 6e48ee6..9e075c0 100644
--- a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/ReferenceSelectorNoDoubleClick.java
+++ b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/ReferenceSelectorNoDoubleClick.java
@@ -1,215 +1,222 @@
-/*------------------------------------------------------------------------------
-  -
-  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 
-  - 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:
-  -
-  - Alessandro Zovi azovi@math.unipd.it
-  - Stefano Puri stefano.puri@intecs.it
-  - Laura Baracchi laura.baracchi@intecs.it
-  - Nicholas Pacini nicholas.pacini@intecs.it  
-  -
-  - Initial API and implementation and/or initial documentation
-  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;
-import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;
-import org.eclipse.papyrus.infra.widgets.providers.IGraphicalContentProvider;
-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
-import org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector;
-import org.eclipse.papyrus.infra.widgets.strategy.ProviderBasedBrowseStrategy;
-import org.eclipse.papyrus.infra.widgets.strategy.StrategyBasedContentProvider;
-import org.eclipse.papyrus.infra.widgets.strategy.TreeBrowseStrategy;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.dialogs.PatternFilter;
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.polarsys.chess.multicore.model.CHTask;
-
-
-/**
- * A copy of the ReferenceSelector class where the treeViewer does not have
- * 
- * any IDoubleClickListener instance.
- *
- * @author Alessandro Zovi
- */
-public class ReferenceSelectorNoDoubleClick extends ReferenceSelector {
-	
-	/** The inst spec not yet assigned to partition. */
-	private EList<InstanceSpecification> instSpecNotYetAssignedToPartition;
-	
-	/** The task not yet assigned to partition. */
-	private EList<CHTask> taskNotYetAssignedToPartition;
-	
-	/**
-	 * Instantiates a new reference selector no double click.
-	 *
-	 * @param unique the unique
-	 */
-	public ReferenceSelectorNoDoubleClick(boolean unique) {
-		super(unique);
-	}
-	
-	/**
-	 * Instantiates a new reference selector no double click.
-	 *
-	 * @param unique the unique
-	 * @param instSpecNotYetAssignedToPartition the inst spec not yet assigned to partition
-	 * @param taskNotYetAssignedToPartition the task not yet assigned to partition
-	 */
-	public ReferenceSelectorNoDoubleClick(boolean unique,
-			EList<InstanceSpecification> instSpecNotYetAssignedToPartition,
-			EList<CHTask> taskNotYetAssignedToPartition) {
-		super(unique);
-		this.instSpecNotYetAssignedToPartition = instSpecNotYetAssignedToPartition;
-		this.taskNotYetAssignedToPartition = taskNotYetAssignedToPartition;
-	}
-	
-	/**
-	 * Refreshes this selector's {@link org.eclipse.swt.widgets.List}
-	 */
-	@Override
-	public void refresh() {
-		((CustomSelectionFilteredBrowseStrategy) contentProvider.getBrowseStrategy()).refresh();
-		treeViewer.refresh();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector#setContentProvider(org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider)
-	 */
-	@Override
-	public void setContentProvider(IStaticContentProvider staticContentProvider) {
-		ITreeContentProvider provider = new EncapsulatedContentProvider(staticContentProvider);
-
-		TreeBrowseStrategy filteredBrowseStrategy = new CustomSelectionFilteredBrowseStrategy(provider);
-
-		TreeBrowseStrategy revealBrowseStrategy = new ProviderBasedBrowseStrategy(provider);
-
-		this.contentProvider = new StrategyBasedContentProvider(filteredBrowseStrategy, revealBrowseStrategy);
-
-		if (treeViewer != null) {
-			treeViewer.setContentProvider(contentProvider);
-			treeViewer.setInput(""); //$NON-NLS-1$
-		}
-
-		if (contentProvider instanceof ICommitListener) {
-			commitListeners.add(contentProvider);
-		}
-	}
-	
-	/**
-	 * The Class CustomSelectionFilteredBrowseStrategy.
-	 */
-	/* LB 20150708
-	 * CustomSelectionFilteredBrowseStrategy was introduced for managing correctly the 
-	 * visualization in the selector of only Inst Specs or Tasks that are not 
-	 * already assigned to partitions or cores (even the first time the panel is opened)
-	 */
-	private class CustomSelectionFilteredBrowseStrategy extends ProviderBasedBrowseStrategy {
-
-		/**
-		 * Instantiates a new custom selection filtered browse strategy.
-		 *
-		 * @param provider the provider
-		 */
-		public CustomSelectionFilteredBrowseStrategy(ITreeContentProvider provider) {
-			super(provider);
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider#isValidValue(java.lang.Object)
-		 */
-		@Override
-		public boolean isValidValue(Object element) {
-			if (!unique) {
-				return super.isValidValue(element);
-			}
-
-			if (!super.isValidValue(element)) {
-				return false;
-			}
-			
-			if(instSpecNotYetAssignedToPartition!=null && !instSpecNotYetAssignedToPartition.contains(element)){								
-				instSpecNotYetAssignedToPartition.add((InstanceSpecification) element);
-				selectedElements.add((InstanceSpecification) element);
-				return false;				
-			}
-			if(taskNotYetAssignedToPartition!=null && !taskNotYetAssignedToPartition.contains(element)){								
-				taskNotYetAssignedToPartition.add((CHTask) element);
-				selectedElements.add((CHTask) element);
-				return false;				
-			}
-			return !selectedElements.contains(getAdaptedValue(element));
-		}
-
-		/**
-		 * Refresh.
-		 */
-		public void refresh() {
-			if (unique) {
-				clearCache();
-			}
-		}
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector#createControls(org.eclipse.swt.widgets.Composite)
-	 */
-	@Override
-	public void createControls(Composite parent) {
-		Composite content = new Composite(parent, SWT.NONE);
-		content.setLayout(new GridLayout(1, true));
-
-		treeViewer = new TreeViewer(content, SWT.BORDER | SWT.MULTI);
-		treeViewer.setFilters(new ViewerFilter[]{ new PatternFilter() });
-
-		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
-		data.minimumHeight = 300;
-		data.minimumWidth = 300;
-		treeViewer.getTree().setLayoutData(data);
-
-		if(labelProvider != null) {
-			treeViewer.setLabelProvider(labelProvider);
-		}
-
-		if(contentProvider != null) {
-			treeViewer.setContentProvider(contentProvider);
-			treeViewer.setInput(""); //$NON-NLS-1$
-		}
-
-		if(contentProvider instanceof IGraphicalContentProvider) {
-			IGraphicalContentProvider graphicalContentProvider = contentProvider;
-
-			Composite beforeTreeComposite = new Composite(content, SWT.NONE);
-			beforeTreeComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-			FillLayout layout = new FillLayout();
-			layout.marginHeight = 0;
-			layout.marginWidth = 0;
-			beforeTreeComposite.setLayout(layout);
-			graphicalContentProvider.createBefore(beforeTreeComposite);
-
-			beforeTreeComposite.moveAbove(treeViewer.getTree());
-
-			Composite afterTreeComposite = new Composite(content, SWT.NONE);
-			layout = new FillLayout();
-			layout.marginHeight = 0;
-			layout.marginWidth = 0;
-			afterTreeComposite.setLayout(layout);
-			afterTreeComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-			graphicalContentProvider.createAfter(afterTreeComposite);
-		}
-	}
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+/*------------------------------------------------------------------------------

+  -

+  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 

+  - All rights reserved. This program and the accompanying materials

+  - are made available under the terms of the Eclipse Public License v2.0

+  - which accompanies this distribution, and is available at

+  - http://www.eclipse.org/legal/epl-v20.html

+  -

+  - Contributors:

+  -

+  - Alessandro Zovi azovi@math.unipd.it

+  - Stefano Puri stefano.puri@intecs.it

+  - Laura Baracchi laura.baracchi@intecs.it

+  - Nicholas Pacini nicholas.pacini@intecs.it  

+  -

+  - Initial API and implementation and/or initial documentation

+  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore;

+

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.jface.viewers.ITreeContentProvider;

+import org.eclipse.jface.viewers.TreeViewer;

+import org.eclipse.jface.viewers.ViewerFilter;

+import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;

+import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;

+import org.eclipse.papyrus.infra.widgets.providers.IGraphicalContentProvider;

+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

+import org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector;

+import org.eclipse.papyrus.infra.widgets.strategy.ProviderBasedBrowseStrategy;

+import org.eclipse.papyrus.infra.widgets.strategy.StrategyBasedContentProvider;

+import org.eclipse.papyrus.infra.widgets.strategy.TreeBrowseStrategy;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.layout.FillLayout;

+import org.eclipse.swt.layout.GridData;

+import org.eclipse.swt.layout.GridLayout;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.ui.dialogs.PatternFilter;

+import org.eclipse.uml2.uml.InstanceSpecification;

+import org.polarsys.chess.multicore.model.CHTask;

+

+

+/**

+ * A copy of the ReferenceSelector class where the treeViewer does not have

+ * 

+ * any IDoubleClickListener instance.

+ *

+ * @author Alessandro Zovi

+ */

+public class ReferenceSelectorNoDoubleClick extends ReferenceSelector {

+	

+	/** The inst spec not yet assigned to partition. */

+	private EList<InstanceSpecification> instSpecNotYetAssignedToPartition;

+	

+	/** The task not yet assigned to partition. */

+	private EList<CHTask> taskNotYetAssignedToPartition;

+	

+	/**

+	 * Instantiates a new reference selector no double click.

+	 *

+	 * @param unique the unique

+	 */

+	public ReferenceSelectorNoDoubleClick(boolean unique) {

+		super(unique);

+	}

+	

+	/**

+	 * Instantiates a new reference selector no double click.

+	 *

+	 * @param unique the unique

+	 * @param instSpecNotYetAssignedToPartition the inst spec not yet assigned to partition

+	 * @param taskNotYetAssignedToPartition the task not yet assigned to partition

+	 */

+	public ReferenceSelectorNoDoubleClick(boolean unique,

+			EList<InstanceSpecification> instSpecNotYetAssignedToPartition,

+			EList<CHTask> taskNotYetAssignedToPartition) {

+		super(unique);

+		this.instSpecNotYetAssignedToPartition = instSpecNotYetAssignedToPartition;

+		this.taskNotYetAssignedToPartition = taskNotYetAssignedToPartition;

+	}

+	

+	/**

+	 * Refreshes this selector's {@link org.eclipse.swt.widgets.List}

+	 */

+	@Override

+	public void refresh() {

+		((CustomSelectionFilteredBrowseStrategy) contentProvider.getBrowseStrategy()).refresh();

+		treeViewer.refresh();

+	}

+	

+	/* (non-Javadoc)

+	 * @see org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector#setContentProvider(org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider)

+	 */

+	@Override

+	public void setContentProvider(IStaticContentProvider staticContentProvider) {

+		ITreeContentProvider provider = new EncapsulatedContentProvider(staticContentProvider);

+

+		TreeBrowseStrategy filteredBrowseStrategy = new CustomSelectionFilteredBrowseStrategy(provider);

+

+		TreeBrowseStrategy revealBrowseStrategy = new ProviderBasedBrowseStrategy(provider);

+

+		this.contentProvider = new StrategyBasedContentProvider(filteredBrowseStrategy, revealBrowseStrategy);

+

+		if (treeViewer != null) {

+			treeViewer.setContentProvider(contentProvider);

+			treeViewer.setInput(""); //$NON-NLS-1$

+		}

+

+		if (contentProvider instanceof ICommitListener) {

+			commitListeners.add(contentProvider);

+		}

+	}

+	

+	/**

+	 * The Class CustomSelectionFilteredBrowseStrategy.

+	 */

+	/* LB 20150708

+	 * CustomSelectionFilteredBrowseStrategy was introduced for managing correctly the 

+	 * visualization in the selector of only Inst Specs or Tasks that are not 

+	 * already assigned to partitions or cores (even the first time the panel is opened)

+	 */

+	private class CustomSelectionFilteredBrowseStrategy extends ProviderBasedBrowseStrategy {

+

+		/**

+		 * Instantiates a new custom selection filtered browse strategy.

+		 *

+		 * @param provider the provider

+		 */

+		public CustomSelectionFilteredBrowseStrategy(ITreeContentProvider provider) {

+			super(provider);

+		}

+

+		/* (non-Javadoc)

+		 * @see org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider#isValidValue(java.lang.Object)

+		 */

+		@Override

+		public boolean isValidValue(Object element) {

+			if (!unique) {

+				return super.isValidValue(element);

+			}

+

+			if (!super.isValidValue(element)) {

+				return false;

+			}

+			

+			if(instSpecNotYetAssignedToPartition!=null && !instSpecNotYetAssignedToPartition.contains(element)){								

+				instSpecNotYetAssignedToPartition.add((InstanceSpecification) element);

+				selectedElements.add((InstanceSpecification) element);

+				return false;				

+			}

+			if(taskNotYetAssignedToPartition!=null && !taskNotYetAssignedToPartition.contains(element)){								

+				taskNotYetAssignedToPartition.add((CHTask) element);

+				selectedElements.add((CHTask) element);

+				return false;				

+			}

+			return !selectedElements.contains(getAdaptedValue(element));

+		}

+

+		/**

+		 * Refresh.

+		 */

+		public void refresh() {

+			if (unique) {

+				clearCache();

+			}

+		}

+	}

+	

+	

+	/* (non-Javadoc)

+	 * @see org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector#createControls(org.eclipse.swt.widgets.Composite)

+	 */

+	@Override

+	public void createControls(Composite parent) {

+		Composite content = new Composite(parent, SWT.NONE);

+		content.setLayout(new GridLayout(1, true));

+

+		treeViewer = new TreeViewer(content, SWT.BORDER | SWT.MULTI);

+		treeViewer.setFilters(new ViewerFilter[]{ new PatternFilter() });

+

+		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);

+		data.minimumHeight = 300;

+		data.minimumWidth = 300;

+		treeViewer.getTree().setLayoutData(data);

+

+		if(labelProvider != null) {

+			treeViewer.setLabelProvider(labelProvider);

+		}

+

+		if(contentProvider != null) {

+			treeViewer.setContentProvider(contentProvider);

+			treeViewer.setInput(""); //$NON-NLS-1$

+		}

+

+		if(contentProvider instanceof IGraphicalContentProvider) {

+			IGraphicalContentProvider graphicalContentProvider = contentProvider;

+

+			Composite beforeTreeComposite = new Composite(content, SWT.NONE);

+			beforeTreeComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));

+			FillLayout layout = new FillLayout();

+			layout.marginHeight = 0;

+			layout.marginWidth = 0;

+			beforeTreeComposite.setLayout(layout);

+			graphicalContentProvider.createBefore(beforeTreeComposite);

+

+			beforeTreeComposite.moveAbove(treeViewer.getTree());

+

+			Composite afterTreeComposite = new Composite(content, SWT.NONE);

+			layout = new FillLayout();

+			layout.marginHeight = 0;

+			layout.marginWidth = 0;

+			afterTreeComposite.setLayout(layout);

+			afterTreeComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));

+			graphicalContentProvider.createAfter(afterTreeComposite);

+		}

+	}

+}

diff --git a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/commands/AssignComponents2CoresCommand.java b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/commands/AssignComponents2CoresCommand.java
index 14ce065..4b59248 100644
--- a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/commands/AssignComponents2CoresCommand.java
+++ b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/commands/AssignComponents2CoresCommand.java
@@ -1,350 +1,357 @@
-/*------------------------------------------------------------------------------
-  -
-  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 
-  - 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:
-  -
-  - Alessandro Zovi azovi@math.unipd.it
-  - Stefano Puri stefano.puri@intecs.it
-  - Laura Baracchi laura.baracchi@intecs.it
-  - Nicholas Pacini nicholas.pacini@intecs.it  
-  -
-  - Initial API and implementation and/or initial documentation
-  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.commands;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Assign;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource;
-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
-import org.eclipse.papyrus.infra.widgets.providers.FilteredContentProvider;
-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
-import org.eclipse.papyrus.infra.widgets.providers.StaticContentProvider;
-import org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Classifier;
-import org.eclipse.uml2.uml.Component;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.uml2.uml.Model;
-import org.eclipse.uml2.uml.Package;
-import org.polarsys.chess.chessmlprofile.Predictability.DeploymentConfiguration.HardwareBaseline.CH_HwProcessor;
-import org.polarsys.chess.core.profiles.CHESSProfileManager;
-import org.polarsys.chess.core.util.uml.ModelError;
-import org.polarsys.chess.core.util.uml.UMLUtils;
-import org.polarsys.chess.multicore.ReferenceSelectorNoDoubleClick;
-import org.polarsys.chess.multicore.dialogs.CoreSelectorDialog;
-import org.polarsys.chess.multicore.dialogs.SystemSelectionDialog;
-import org.polarsys.chess.multicore.model.AbstractCommand;
-import org.polarsys.chess.multicore.model.CHCore;
-import org.polarsys.chess.multicore.utils.QueryUtils;
-
-/**
- * The Class AssignComponents2CoresCommand.
- */
-public class AssignComponents2CoresCommand extends
-AbstractCommand {
-
-	/** The cores. */
-	private EList<CHCore> cores;
-	
-	/** The components. */
-	private EList<InstanceSpecification> components;
-	
-	/** The result. */
-	private Map<CHCore, LinkedHashSet<Object>> result;
-	
-	/** The processors. */
-	private EList<InstanceSpecification> processors;
-	
-	/** The hw system. */
-	private static Component hwSystem;
-	
-	/** The processors map. */
-	private Map<Package, EList<InstanceSpecification>> processorsMap =  new HashMap<Package, EList<InstanceSpecification>>();
-	
-	/** The cores map. */
-	private Map<InstanceSpecification, EList<CHCore>> coresMap = new HashMap<InstanceSpecification, EList<CHCore>>();
-	
-	/** The hw systems list. */
-	private EList<InstanceSpecification> hwSystemsList = new BasicEList<InstanceSpecification>();
-
-	/** The assignments. */
-	private EList<Assign> assignments;
-
-
-	/**
-	 * Open selector to choose HW system where assign components.
-	 *
-	 * @param umlModel the uml model
-	 * @param hwSystemsList the hw systems list
-	 * @return the instance specification
-	 */
-	private static InstanceSpecification openSystemSelector (Model umlModel, 
-			EList<InstanceSpecification> hwSystemsList) {
-
-		// First of all show selector to select HwSystem
-		List<InstanceSpecification> systemSelection = new ArrayList<InstanceSpecification>();
-		for (InstanceSpecification syst : hwSystemsList) {
-			systemSelection.add(syst);
-		}
-
-		Shell activeShell = Display.getDefault().getActiveShell();
-		SystemSelectionDialog systemDialog = new SystemSelectionDialog(activeShell, systemSelection, "Select System where to assign tasks");
-		if (systemDialog.open() == Window.OK) {
-			String selectedSystemQN = systemDialog.getSystemName();
-			EList<Element> allElems = umlModel.allOwnedElements();
-			for (Element elem : allElems) {
-				InstanceSpecification theSystem;
-				if (elem instanceof InstanceSpecification) {
-					theSystem = (InstanceSpecification)elem;
-					if (theSystem.getQualifiedName()!=null && theSystem.getQualifiedName().equals(selectedSystemQN)) {							
-						Classifier classif = theSystem.getClassifiers().get(0);
-						hwSystem = (Component)classif;
-						return theSystem;
-					}				
-				}
-			}
-		}
-		return null;
-	}
-
-
-	/**
-	 * Open wizard to assign components to cores.
-	 *
-	 * @param components the components
-	 * @param pack the pack
-	 * @param cores the cores
-	 * @param assignments the assignments
-	 * @return the map
-	 */
-	private static Map<CHCore, LinkedHashSet<Object>> openWizard(
-			final EList<InstanceSpecification> components,
-			Package pack, 
-			EList<CHCore> cores,
-			EList<Assign> assignments) {
-
-	
-		
-		ServicesRegistry servicesRegistry =null;
-		try {
-			servicesRegistry = ServiceUtilsForResource.getInstance().getServiceRegistry(pack.eResource());
-		} catch (ServiceException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
-
-		// LB 20150713 Show components in the left side 
-		// Only show the components that are not assigned to a Processor 
-		EList<InstanceSpecification> instSpecNotYetAssignedToCore = new BasicEList<InstanceSpecification>();
-		for (InstanceSpecification i : components) {
-			if (!(QueryUtils.isAssigned2Core(i, pack, assignments))) {
-				instSpecNotYetAssignedToCore.add(i);			
-			}
-		}	
-		final ReferenceSelector referenceSelector = new ReferenceSelectorNoDoubleClick(
-				true, instSpecNotYetAssignedToCore, null);
-
-		final IStaticContentProvider semanticProvider = new StaticContentProvider(
-				components.toArray());
-
-		final FilteredContentProvider filteredProvider = new FilteredContentProvider(
-				semanticProvider);		
-		referenceSelector.setContentProvider(filteredProvider);
-		///
-
-		CoreSelectorDialog dialog = null;
-
-		ILabelProvider serv = null;
-		try {
-			serv = servicesRegistry.getService(LabelProviderService.class)
-					.getLabelProvider();
-		} catch (final ServiceException e) {
-			// Activator.log.error("LabelProviderServiceNotFound", e);
-		}
-
-//		org.eclipse.uml2.uml.Package pack;
-		referenceSelector.setLabelProvider(serv);
-		dialog = new CoreSelectorDialog(Display.getDefault()
-				.getActiveShell(), referenceSelector, cores, pack,
-				assignments,
-				CoreSelectorDialog.COMPONENTS_TO_CORES,
-				"Assign Software Components to Cores");
-
-		dialog.setLabelProvider(serv);
-		//dialog.setMessage("Messages.CreateDiagramImage_LifelineDialogMessage");
-		//dialog.setTitle("Messages.CreateDiagramImage_LifelineDialogTitle");
-		// dialog.setInitialElementSelections(insts2);
-
-		if (dialog.open() == org.eclipse.jface.window.Window.OK) {
-			Map<CHCore, LinkedHashSet<Object>> result = dialog
-					.getResult();
-			if (result != null)
-				return result;
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.polarsys.chess.multicore.model.AbstractCommand#execute()
-	 */
-	@Override
-	public void execute() throws ModelError {
-		queryContent(umlModel);
-		printContent();
-
-		int howMany = hwSystemsList.size();
-
-		InstanceSpecification theSystem = null;
-		if (howMany > 1) {
-			theSystem = openSystemSelector(umlModel, hwSystemsList);
-		}
-		else {
-			theSystem = hwSystemsList.get(0);
-		}
-		if (theSystem!=null) {
-			Package pack = QueryUtils.getOwnerCHGaResourcePlatformPackage(umlModel, theSystem);
-
-			EList<InstanceSpecification> processorList = processorsMap.get(pack);
-
-			EList<CHCore> cores =  new BasicEList<CHCore>();
-			if (processorList!=null) {						
-				for (InstanceSpecification proc : processorList) {
-					EList<CHCore> coreList = coresMap.get(proc);
-					for (CHCore core : coreList) {
-						cores.add(core);
-					}
-				}
-			}
-
-			result = openWizard(components, pack, cores, assignments);
-			if (result != null) {
-				updateModel();
-			}
-		}
-	}
-
-	/**
-	 * Prints the content.
-	 */
-	private void printContent() {
-		System.out.println("Components:");
-		for (InstanceSpecification component : components) {
-			System.out.println(component.getQualifiedName());
-		}
-		
-		Set<Package> packs = processorsMap.keySet();
-		for (Package pack: packs) {
-			System.out.println("Package: "+pack.getName());
-			EList<InstanceSpecification> procList = processorsMap.get(pack);
-			for (InstanceSpecification theProc : procList) {
-				System.out.println("Processor: "+theProc.getName());				 
-				EList<CHCore> coreList = coresMap.get(theProc);
-				for (CHCore theCore : coreList) {
-					System.out.println("Core: "+theCore.getName());
-				}
-			}
-		}
-	}
-
-	/**
-	 * Update model.
-	 */
-	private void updateModel() {
-		TransactionalEditingDomain editingDomain = TransactionUtil
-				.getEditingDomain(umlModel);
-		editingDomain.getCommandStack().execute(new Com(editingDomain));
-	}
-
-	/**
-	 * Query content.
-	 *
-	 * @param umlModel the uml model
-	 * @throws ModelError the model error
-	 */
-	private void queryContent(Model umlModel) throws ModelError {
-
-		hwSystem = UMLUtils.getResourcePlatformComponent(umlModel, CHESSProfileManager.DEPLOYMENT_VIEW);
-		
-		// Look for Packages stereotyped as CHGAResourcePlatform in the Deployment View
-		EList<Package> packages = QueryUtils.getResourcePlatformPackages(umlModel, CHESSProfileManager.DEPLOYMENT_VIEW);		
-
-		if (packages.size()==0) {
-			ModelError me = new ModelError("Error in model: no Package stereotyped as CHGAResourcePlatform in the Deployment View!");
-			throw me;
-		}
-		hwSystemsList = new BasicEList<InstanceSpecification>();
- 		for(Package pack : packages) {		
-			EList<InstanceSpecification> processors = new BasicEList<InstanceSpecification>();
-			for (CH_HwProcessor ch_processor : QueryUtils.getAllProcessorInstancesInPackage(pack)) {
-				InstanceSpecification instSpec = ch_processor.getBase_InstanceSpecification();
-				processors.add(instSpec);				
-				EList<CHCore> theCores = QueryUtils.getCores(ch_processor);
-				coresMap.put(instSpec, theCores);				
-			}
-			InstanceSpecification theSystem = UMLUtils.getRootInstanceInPackage(pack);
-			hwSystemsList.add(theSystem);
-			processorsMap.put(pack, processors);
-		}
- 		
- 		if (hwSystemsList.isEmpty()) {
- 			ModelError me = new ModelError("Error in model: no System in the Deployment View!");
-			throw me;
- 		}
-		
-
-//		processors = new BasicEList<InstanceSpecification>();
-//		cores = new BasicEList<CHCore>();
-//		for (CH_HwProcessor ch_processor : QueryUtils.getAllProcessorInstances(umlModel)) {
-//			processors.add(ch_processor.getBase_InstanceSpecification());
-//			cores.addAll(QueryUtils.getCores(ch_processor));
-//		}
-		components = UMLUtils.getAllComponentInstances(umlModel, true);
-		assignments = UMLUtils.getComponent2CoreAssignments(umlModel, CHESSProfileManager.DEPLOYMENT_VIEW);
-	}
-
-	/**
-	 * The Class Com.
-	 */
-	class Com extends RecordingCommand {
-
-		/**
-		 * Instantiates a new com.
-		 *
-		 * @param domain the domain
-		 */
-		public Com(TransactionalEditingDomain domain) {
-			super(domain);
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()
-		 */
-		@Override
-		protected void doExecute() {
-			QueryUtils.deleteComponent2CoreAssociations(hwSystem);
-			QueryUtils.buildInstance2CoreAssignments(hwSystem, result);
-		}
-	}
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+/*------------------------------------------------------------------------------

+  -

+  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 

+  - All rights reserved. This program and the accompanying materials

+  - are made available under the terms of the Eclipse Public License v2.0

+  - which accompanies this distribution, and is available at

+  - http://www.eclipse.org/legal/epl-v20.html

+  -

+  - Contributors:

+  -

+  - Alessandro Zovi azovi@math.unipd.it

+  - Stefano Puri stefano.puri@intecs.it

+  - Laura Baracchi laura.baracchi@intecs.it

+  - Nicholas Pacini nicholas.pacini@intecs.it  

+  -

+  - Initial API and implementation and/or initial documentation

+  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.commands;

+

+import java.util.ArrayList;

+import java.util.HashMap;

+import java.util.LinkedHashSet;

+import java.util.List;

+import java.util.Map;

+import java.util.Set;

+

+import org.eclipse.emf.common.util.BasicEList;

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.emf.transaction.util.TransactionUtil;

+import org.eclipse.jface.viewers.ILabelProvider;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Assign;

+import org.eclipse.papyrus.infra.core.services.ServiceException;

+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource;

+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

+import org.eclipse.papyrus.infra.widgets.providers.FilteredContentProvider;

+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

+import org.eclipse.papyrus.infra.widgets.providers.StaticContentProvider;

+import org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Classifier;

+import org.eclipse.uml2.uml.Component;

+import org.eclipse.uml2.uml.Element;

+import org.eclipse.uml2.uml.InstanceSpecification;

+import org.eclipse.uml2.uml.Model;

+import org.eclipse.uml2.uml.Package;

+import org.polarsys.chess.chessmlprofile.Predictability.DeploymentConfiguration.HardwareBaseline.CH_HwProcessor;

+import org.polarsys.chess.core.profiles.CHESSProfileManager;

+import org.polarsys.chess.core.util.uml.ModelError;

+import org.polarsys.chess.core.util.uml.UMLUtils;

+import org.polarsys.chess.multicore.ReferenceSelectorNoDoubleClick;

+import org.polarsys.chess.multicore.dialogs.CoreSelectorDialog;

+import org.polarsys.chess.multicore.dialogs.SystemSelectionDialog;

+import org.polarsys.chess.multicore.model.AbstractCommand;

+import org.polarsys.chess.multicore.model.CHCore;

+import org.polarsys.chess.multicore.utils.QueryUtils;

+

+/**

+ * The Class AssignComponents2CoresCommand.

+ */

+public class AssignComponents2CoresCommand extends

+AbstractCommand {

+

+	/** The cores. */

+	private EList<CHCore> cores;

+	

+	/** The components. */

+	private EList<InstanceSpecification> components;

+	

+	/** The result. */

+	private Map<CHCore, LinkedHashSet<Object>> result;

+	

+	/** The processors. */

+	private EList<InstanceSpecification> processors;

+	

+	/** The hw system. */

+	private static Component hwSystem;

+	

+	/** The processors map. */

+	private Map<Package, EList<InstanceSpecification>> processorsMap =  new HashMap<Package, EList<InstanceSpecification>>();

+	

+	/** The cores map. */

+	private Map<InstanceSpecification, EList<CHCore>> coresMap = new HashMap<InstanceSpecification, EList<CHCore>>();

+	

+	/** The hw systems list. */

+	private EList<InstanceSpecification> hwSystemsList = new BasicEList<InstanceSpecification>();

+

+	/** The assignments. */

+	private EList<Assign> assignments;

+

+

+	/**

+	 * Open selector to choose HW system where assign components.

+	 *

+	 * @param umlModel the uml model

+	 * @param hwSystemsList the hw systems list

+	 * @return the instance specification

+	 */

+	private static InstanceSpecification openSystemSelector (Model umlModel, 

+			EList<InstanceSpecification> hwSystemsList) {

+

+		// First of all show selector to select HwSystem

+		List<InstanceSpecification> systemSelection = new ArrayList<InstanceSpecification>();

+		for (InstanceSpecification syst : hwSystemsList) {

+			systemSelection.add(syst);

+		}

+

+		Shell activeShell = Display.getDefault().getActiveShell();

+		SystemSelectionDialog systemDialog = new SystemSelectionDialog(activeShell, systemSelection, "Select System where to assign tasks");

+		if (systemDialog.open() == Window.OK) {

+			String selectedSystemQN = systemDialog.getSystemName();

+			EList<Element> allElems = umlModel.allOwnedElements();

+			for (Element elem : allElems) {

+				InstanceSpecification theSystem;

+				if (elem instanceof InstanceSpecification) {

+					theSystem = (InstanceSpecification)elem;

+					if (theSystem.getQualifiedName()!=null && theSystem.getQualifiedName().equals(selectedSystemQN)) {							

+						Classifier classif = theSystem.getClassifiers().get(0);

+						hwSystem = (Component)classif;

+						return theSystem;

+					}				

+				}

+			}

+		}

+		return null;

+	}

+

+

+	/**

+	 * Open wizard to assign components to cores.

+	 *

+	 * @param components the components

+	 * @param pack the pack

+	 * @param cores the cores

+	 * @param assignments the assignments

+	 * @return the map

+	 */

+	private static Map<CHCore, LinkedHashSet<Object>> openWizard(

+			final EList<InstanceSpecification> components,

+			Package pack, 

+			EList<CHCore> cores,

+			EList<Assign> assignments) {

+

+	

+		

+		ServicesRegistry servicesRegistry =null;

+		try {

+			servicesRegistry = ServiceUtilsForResource.getInstance().getServiceRegistry(pack.eResource());

+		} catch (ServiceException e1) {

+			// TODO Auto-generated catch block

+			e1.printStackTrace();

+		}

+

+		// LB 20150713 Show components in the left side 

+		// Only show the components that are not assigned to a Processor 

+		EList<InstanceSpecification> instSpecNotYetAssignedToCore = new BasicEList<InstanceSpecification>();

+		for (InstanceSpecification i : components) {

+			if (!(QueryUtils.isAssigned2Core(i, pack, assignments))) {

+				instSpecNotYetAssignedToCore.add(i);			

+			}

+		}	

+		final ReferenceSelector referenceSelector = new ReferenceSelectorNoDoubleClick(

+				true, instSpecNotYetAssignedToCore, null);

+

+		final IStaticContentProvider semanticProvider = new StaticContentProvider(

+				components.toArray());

+

+		final FilteredContentProvider filteredProvider = new FilteredContentProvider(

+				semanticProvider);		

+		referenceSelector.setContentProvider(filteredProvider);

+		///

+

+		CoreSelectorDialog dialog = null;

+

+		ILabelProvider serv = null;

+		try {

+			serv = servicesRegistry.getService(LabelProviderService.class)

+					.getLabelProvider();

+		} catch (final ServiceException e) {

+			// Activator.log.error("LabelProviderServiceNotFound", e);

+		}

+

+//		org.eclipse.uml2.uml.Package pack;

+		referenceSelector.setLabelProvider(serv);

+		dialog = new CoreSelectorDialog(Display.getDefault()

+				.getActiveShell(), referenceSelector, cores, pack,

+				assignments,

+				CoreSelectorDialog.COMPONENTS_TO_CORES,

+				"Assign Software Components to Cores");

+

+		dialog.setLabelProvider(serv);

+		//dialog.setMessage("Messages.CreateDiagramImage_LifelineDialogMessage");

+		//dialog.setTitle("Messages.CreateDiagramImage_LifelineDialogTitle");

+		// dialog.setInitialElementSelections(insts2);

+

+		if (dialog.open() == org.eclipse.jface.window.Window.OK) {

+			Map<CHCore, LinkedHashSet<Object>> result = dialog

+					.getResult();

+			if (result != null)

+				return result;

+		}

+		return null;

+	}

+

+	/* (non-Javadoc)

+	 * @see org.polarsys.chess.multicore.model.AbstractCommand#execute()

+	 */

+	@Override

+	public void execute() throws ModelError {

+		queryContent(umlModel);

+		printContent();

+

+		int howMany = hwSystemsList.size();

+

+		InstanceSpecification theSystem = null;

+		if (howMany > 1) {

+			theSystem = openSystemSelector(umlModel, hwSystemsList);

+		}

+		else {

+			theSystem = hwSystemsList.get(0);

+		}

+		if (theSystem!=null) {

+			Package pack = QueryUtils.getOwnerCHGaResourcePlatformPackage(umlModel, theSystem);

+

+			EList<InstanceSpecification> processorList = processorsMap.get(pack);

+

+			EList<CHCore> cores =  new BasicEList<CHCore>();

+			if (processorList!=null) {						

+				for (InstanceSpecification proc : processorList) {

+					EList<CHCore> coreList = coresMap.get(proc);

+					for (CHCore core : coreList) {

+						cores.add(core);

+					}

+				}

+			}

+

+			result = openWizard(components, pack, cores, assignments);

+			if (result != null) {

+				updateModel();

+			}

+		}

+	}

+

+	/**

+	 * Prints the content.

+	 */

+	private void printContent() {

+		System.out.println("Components:");

+		for (InstanceSpecification component : components) {

+			System.out.println(component.getQualifiedName());

+		}

+		

+		Set<Package> packs = processorsMap.keySet();

+		for (Package pack: packs) {

+			System.out.println("Package: "+pack.getName());

+			EList<InstanceSpecification> procList = processorsMap.get(pack);

+			for (InstanceSpecification theProc : procList) {

+				System.out.println("Processor: "+theProc.getName());				 

+				EList<CHCore> coreList = coresMap.get(theProc);

+				for (CHCore theCore : coreList) {

+					System.out.println("Core: "+theCore.getName());

+				}

+			}

+		}

+	}

+

+	/**

+	 * Update model.

+	 */

+	private void updateModel() {

+		TransactionalEditingDomain editingDomain = TransactionUtil

+				.getEditingDomain(umlModel);

+		editingDomain.getCommandStack().execute(new Com(editingDomain));

+	}

+

+	/**

+	 * Query content.

+	 *

+	 * @param umlModel the uml model

+	 * @throws ModelError the model error

+	 */

+	private void queryContent(Model umlModel) throws ModelError {

+

+		hwSystem = UMLUtils.getResourcePlatformComponent(umlModel, CHESSProfileManager.DEPLOYMENT_VIEW);

+		

+		// Look for Packages stereotyped as CHGAResourcePlatform in the Deployment View

+		EList<Package> packages = QueryUtils.getResourcePlatformPackages(umlModel, CHESSProfileManager.DEPLOYMENT_VIEW);		

+

+		if (packages.size()==0) {

+			ModelError me = new ModelError("Error in model: no Package stereotyped as CHGAResourcePlatform in the Deployment View!");

+			throw me;

+		}

+		hwSystemsList = new BasicEList<InstanceSpecification>();

+ 		for(Package pack : packages) {		

+			EList<InstanceSpecification> processors = new BasicEList<InstanceSpecification>();

+			for (CH_HwProcessor ch_processor : QueryUtils.getAllProcessorInstancesInPackage(pack)) {

+				InstanceSpecification instSpec = ch_processor.getBase_InstanceSpecification();

+				processors.add(instSpec);				

+				EList<CHCore> theCores = QueryUtils.getCores(ch_processor);

+				coresMap.put(instSpec, theCores);				

+			}

+			InstanceSpecification theSystem = UMLUtils.getRootInstanceInPackage(pack);

+			hwSystemsList.add(theSystem);

+			processorsMap.put(pack, processors);

+		}

+ 		

+ 		if (hwSystemsList.isEmpty()) {

+ 			ModelError me = new ModelError("Error in model: no System in the Deployment View!");

+			throw me;

+ 		}

+		

+

+//		processors = new BasicEList<InstanceSpecification>();

+//		cores = new BasicEList<CHCore>();

+//		for (CH_HwProcessor ch_processor : QueryUtils.getAllProcessorInstances(umlModel)) {

+//			processors.add(ch_processor.getBase_InstanceSpecification());

+//			cores.addAll(QueryUtils.getCores(ch_processor));

+//		}

+		components = UMLUtils.getAllComponentInstances(umlModel, true);

+		assignments = UMLUtils.getComponent2CoreAssignments(umlModel, CHESSProfileManager.DEPLOYMENT_VIEW);

+	}

+

+	/**

+	 * The Class Com.

+	 */

+	class Com extends RecordingCommand {

+

+		/**

+		 * Instantiates a new com.

+		 *

+		 * @param domain the domain

+		 */

+		public Com(TransactionalEditingDomain domain) {

+			super(domain);

+		}

+

+		/* (non-Javadoc)

+		 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()

+		 */

+		@Override

+		protected void doExecute() {

+			QueryUtils.deleteComponent2CoreAssociations(hwSystem);

+			QueryUtils.buildInstance2CoreAssignments(hwSystem, result);

+		}

+	}

+}

diff --git a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/commands/AssignTasks2CoresCommand.java b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/commands/AssignTasks2CoresCommand.java
index 8b0f8ae..805cef0 100644
--- a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/commands/AssignTasks2CoresCommand.java
+++ b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/commands/AssignTasks2CoresCommand.java
@@ -1,388 +1,395 @@
-/*------------------------------------------------------------------------------
-  -
-  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 
-  - 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:
-  -
-  - Alessandro Zovi azovi@math.unipd.it
-  - Stefano Puri stefano.puri@intecs.it
-  - Laura Baracchi laura.baracchi@intecs.it
-  - Nicholas Pacini nicholas.pacini@intecs.it  
-  -
-  - Initial API and implementation and/or initial documentation
-  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.commands;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Assign;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource;
-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
-import org.eclipse.papyrus.infra.widgets.providers.FilteredContentProvider;
-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
-import org.eclipse.papyrus.infra.widgets.providers.StaticContentProvider;
-import org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.uml2.uml.Classifier;
-import org.eclipse.uml2.uml.Component;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.uml2.uml.Model;
-import org.eclipse.uml2.uml.Package;
-import org.polarsys.chess.chessmlprofile.Predictability.DeploymentConfiguration.HardwareBaseline.CH_HwProcessor;
-import org.polarsys.chess.core.profiles.CHESSProfileManager;
-import org.polarsys.chess.core.util.uml.ModelError;
-import org.polarsys.chess.core.util.uml.UMLUtils;
-import org.polarsys.chess.multicore.ReferenceSelectorNoDoubleClick;
-import org.polarsys.chess.multicore.dialogs.CoreSelectorDialog;
-import org.polarsys.chess.multicore.dialogs.SystemSelectionDialog;
-import org.polarsys.chess.multicore.model.AbstractCommand;
-import org.polarsys.chess.multicore.model.CHCore;
-import org.polarsys.chess.multicore.model.CHTask;
-import org.polarsys.chess.multicore.utils.GeneratorUtils;
-import org.polarsys.chess.multicore.utils.QueryUtils;
-
-/**
- * The Class AssignTasks2CoresCommand.
- */
-public class AssignTasks2CoresCommand extends
-AbstractCommand {
-
-	/** The tasks. */
-	private EList<CHTask> tasks;	
-	
-	/** The processors map. */
-	private Map<Package, EList<InstanceSpecification>> processorsMap =  new HashMap<Package, EList<InstanceSpecification>>();
-	
-	/** The cores map. */
-	private Map<InstanceSpecification, EList<CHCore>> coresMap = new HashMap<InstanceSpecification, EList<CHCore>>();
-	
-	/** The result. */
-	private Map<CHCore, LinkedHashSet<Object>> result;
-	
-	/** The hw system. */
-	private static Component hwSystem;
-	
-	/** The operation list. */
-	private HashMap<CHTask, EList<CHTask>> operationList;
-	
-	/** The assignments. */
-	private EList<Assign> assignments;
-	
-	/** The hw systems list. */
-	private EList<InstanceSpecification> hwSystemsList = new BasicEList<InstanceSpecification>();
-
-	
-	/**
-	 * Open selector to choose HW system where assign tasks.
-	 *
-	 * @param umlModel the uml model
-	 * @param hwSystemsList the hw systems list
-	 * @return the instance specification
-	 */
-	private static InstanceSpecification openSystemSelector (Model umlModel, 
-			EList<InstanceSpecification> hwSystemsList) {
-
-		// First of all show selector to select HwSystem
-		List<InstanceSpecification> systemSelection = new ArrayList<InstanceSpecification>();
-		for (InstanceSpecification syst : hwSystemsList) {
-			systemSelection.add(syst);
-		}
-
-		Shell activeShell = Display.getDefault().getActiveShell();
-		SystemSelectionDialog systemDialog = new SystemSelectionDialog(activeShell, systemSelection, "Select System where to assign tasks");
-		if (systemDialog.open() == Window.OK) {
-			String selectedSystemQN = systemDialog.getSystemName();
-			EList<Element> allElems = umlModel.allOwnedElements();
-			for (Element elem : allElems) {
-				InstanceSpecification theSystem;
-				if (elem instanceof InstanceSpecification) {
-					theSystem = (InstanceSpecification)elem;
-					if (theSystem.getQualifiedName()!=null && theSystem.getQualifiedName().equals(selectedSystemQN)) {							
-						Classifier classif = theSystem.getClassifiers().get(0);
-						hwSystem = (Component)classif;
-						return theSystem;
-					}				
-				}
-			}
-		}
-		return null;
-	}
-
-
-	/**
-	 * Open the Wizard window to assign tasks to Cores (for the selected HW System).
-	 *
-	 * @param tasks the tasks
-	 * @param pack the pack
-	 * @param cores the cores
-	 * @param assignments the assignments
-	 * @return the map
-	 */
-	private static Map<CHCore, LinkedHashSet<Object>> openWizard(
-			final EList<CHTask> tasks,
-			Package pack,
-			EList<CHCore> cores,
-			EList<Assign> assignments) {
-
-//		final ServicesRegistry servicesRegistry = ((IMultiDiagramEditor) (PlatformUI
-//				.getWorkbench().getActiveWorkbenchWindow().getActivePage()
-//				.getActiveEditor())).getServicesRegistry();
-		
-		ServicesRegistry servicesRegistry = null;
-		try {
-			servicesRegistry = ServiceUtilsForResource.getInstance().getServiceRegistry(pack.eResource());
-		} catch (ServiceException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-			return null;
-		}
-
-		// Look for the tasks that are not assigned to a Processor in this package (deployment)
-		EList<CHTask> taskNotYetAssignedToCore = new BasicEList<CHTask>();
-		for (CHTask i : tasks) {
-			if (!(QueryUtils.isTaskAssigned2Core(i, pack, assignments))) {
-				taskNotYetAssignedToCore.add(i);			
-			}
-		}	
-		
-		final ReferenceSelector referenceSelector = new ReferenceSelectorNoDoubleClick(
-				true, null, taskNotYetAssignedToCore);
-
-		final IStaticContentProvider semanticProvider = new StaticContentProvider(
-				tasks.toArray());
-
-		final FilteredContentProvider filteredProvider = new FilteredContentProvider(
-				semanticProvider);		
-		referenceSelector.setContentProvider(filteredProvider);		
-
-		CoreSelectorDialog dialog = null;
-
-		ILabelProvider serv = null;
-		try {
-			serv = servicesRegistry.getService(LabelProviderService.class)
-					.getLabelProvider();
-		} catch (final ServiceException e) {
-			// Activator.log.error("LabelProviderServiceNotFound", e);
-		}
-
-		referenceSelector.setLabelProvider(serv);
-		dialog = new CoreSelectorDialog(Display.getDefault()
-				.getActiveShell(), referenceSelector, cores, pack, assignments,
-				CoreSelectorDialog.TASKS_TO_CORES,
-				"Assign Tasks to Cores");
-
-		dialog.setLabelProvider(serv);
-		//dialog.setMessage("Messages.CreateDiagramImage_LifelineDialogMessage");
-		//dialog.setTitle("Messages.CreateDiagramImage_LifelineDialogTitle");
-		// dialog.setInitialElementSelections(insts2);
-
-		if (dialog.open() == org.eclipse.jface.window.Window.OK) {
-			Map<CHCore, LinkedHashSet<Object>> result = dialog
-					.getResult();
-			if (result != null)
-				return result;
-		}
-		return null;
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.polarsys.chess.multicore.model.AbstractCommand#execute()
-	 */
-	@Override
-	public void execute() throws ModelError {
-		queryContent(umlModel);
-		printContent();		
-		
-		int howMany = hwSystemsList.size();
-		
-		InstanceSpecification theSystem = null;
-		if (howMany > 1) {
-			theSystem = openSystemSelector(umlModel, hwSystemsList);
-		}
-		else {
-			theSystem = hwSystemsList.get(0);
-		}
-		
-		if (theSystem!=null) {
-			Package pack = QueryUtils.getOwnerCHGaResourcePlatformPackage(umlModel, theSystem);
-	
-			EList<InstanceSpecification> processorList = processorsMap.get(pack);
-	
-			EList<CHCore> cores =  new BasicEList<CHCore>();
-			if (processorList!=null) {						
-				for (InstanceSpecification proc : processorList) {
-					EList<CHCore> coreList = coresMap.get(proc);
-					for (CHCore core : coreList) {
-						cores.add(core);
-					}
-				}
-			}
-	
-			result = openWizard(tasks, pack, cores, assignments);
-	
-			if (result != null) {
-				updateModel();
-			}
-		}
-	}
-
-	
-	/**
-	 * Prints the content.
-	 */
-	private void printContent() {
-		System.out.println("Tasks:");
-		for (CHTask component : tasks) {
-			System.out.println(component);
-		}		
-		Set<Package> packs = processorsMap.keySet();
-		for (Package pack: packs) {
-			System.out.println("Package: "+pack.getName());
-			EList<InstanceSpecification> procList = processorsMap.get(pack);
-			for (InstanceSpecification theProc : procList) {
-				System.out.println("Processor: "+theProc.getName());				 
-				EList<CHCore> coreList = coresMap.get(theProc);
-				for (CHCore theCore : coreList) {
-					System.out.println("Core: "+theCore.getName());
-				}
-			}
-		}
-	}
-
-	
-	/**
-	 * Update model.
-	 */
-	private void updateModel() {
-		TransactionalEditingDomain editingDomain = TransactionUtil
-				.getEditingDomain(umlModel);
-		editingDomain.getCommandStack().execute(new Com(editingDomain));
-	}
-
-	/**
-	 * Get all that is needed from the model.
-	 *
-	 * @param umlModel the uml model
-	 * @throws ModelError the model error
-	 */
-	private void queryContent(Model umlModel) throws ModelError {
-		try{
-			hwSystem = UMLUtils.getResourcePlatformComponent(umlModel, CHESSProfileManager.DEPLOYMENT_VIEW);
-		}catch (ModelError me){
-			ModelError me2 = new ModelError(me.getMessage()+" Be sure that HW root Components in the ComponentView are stereotyped with CHGaResourcePlatorm");
-			throw me2;
-		}
-
-		// Look for Packages stereotyped as CHGAResourcePlatform in the Deployment View
-		EList<Package> packages = QueryUtils.getResourcePlatformPackages(umlModel, CHESSProfileManager.DEPLOYMENT_VIEW);		
-
-		if (packages.size()==0) {
-			ModelError me = new ModelError("Error in model: no Package stereotyped as CHGAResourcePlatform in the Deployment View!");
-			throw me;
-		}
-		hwSystemsList = new BasicEList<InstanceSpecification>();
-		
- 		for(Package pack : packages) {		
-			EList<InstanceSpecification> processors = new BasicEList<InstanceSpecification>();
-			for (CH_HwProcessor ch_processor : QueryUtils.getAllProcessorInstancesInPackage(pack)) {
-				InstanceSpecification instSpec = ch_processor.getBase_InstanceSpecification();
-				processors.add(instSpec);				
-				EList<CHCore> theCores = QueryUtils.getCores(ch_processor);
-				coresMap.put(instSpec, theCores);				
-			}
-			InstanceSpecification theSystem = UMLUtils.getRootInstanceInPackage(pack);
-			hwSystemsList.add(theSystem);
-			processorsMap.put(pack, processors);
-		}
- 		
- 		if (hwSystemsList.isEmpty()) {
- 			ModelError me = new ModelError("Error in model: no System in the Deployment View!");
-			throw me;
- 		}
-
-		EList<InstanceSpecification> instances = UMLUtils.getAllComponentInstances(umlModel, true);
-		tasks = QueryUtils.getCHTasksList(instances);
-
-		operationList = QueryUtils.getOperationChain(umlModel, tasks);
-		assignments = UMLUtils.getTask2CoreAssignments(umlModel, CHESSProfileManager.DEPLOYMENT_VIEW);
-	}
-
-	/**
-	 * The Class Com.
-	 */
-	class Com extends RecordingCommand {
-
-		/** The assigned operations. */
-		private HashSet<CHTask> assignedOperations;
-
-		/**
-		 * Instantiates a new com.
-		 *
-		 * @param domain the domain
-		 */
-		public Com(TransactionalEditingDomain domain) {
-			super(domain);
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()
-		 */
-		@Override
-		protected void doExecute() {
-
-			Map<CHCore, LinkedHashSet<Object>> core2chtask = new HashMap<CHCore, LinkedHashSet<Object>>();
-
-			for (CHCore core : result.keySet()) {
-				assignedOperations = new HashSet<CHTask>();
-				LinkedHashSet<Object> list = new LinkedHashSet<Object>();
-				for (Object task : result.get(core)) {
-					CHTask owningTask = (CHTask) task;
-					list.add(owningTask);
-					addRelatedOperations(owningTask, list);
-				}
-				core2chtask.put(core, list);
-			}	
-
-			QueryUtils.deleteTask2CoreAssociations(hwSystem);
-			GeneratorUtils.buildTask2CoreAssociations(hwSystem, core2chtask);
-		}
-
-		//the related operations of a task are assigned to the same core of the task,
-		/**
-		 * Adds the related operations.
-		 *
-		 * @param owningTask the owning task
-		 * @param list the list
-		 */
-		//TODO for now every operation shared by multiple tasks is assigned to the same core of the first task that was processed
-		private void addRelatedOperations(CHTask owningTask, LinkedHashSet<Object> list) {
-			for (CHTask operation : operationList.get(owningTask)) {
-				if(!assignedOperations.contains(operation)) {
-					list.add(operation);
-					assignedOperations.add(operation);
-				}
-			}
-		}
-	}
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+/*------------------------------------------------------------------------------

+  -

+  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 

+  - All rights reserved. This program and the accompanying materials

+  - are made available under the terms of the Eclipse Public License v2.0

+  - which accompanies this distribution, and is available at

+  - http://www.eclipse.org/legal/epl-v20.html

+  -

+  - Contributors:

+  -

+  - Alessandro Zovi azovi@math.unipd.it

+  - Stefano Puri stefano.puri@intecs.it

+  - Laura Baracchi laura.baracchi@intecs.it

+  - Nicholas Pacini nicholas.pacini@intecs.it  

+  -

+  - Initial API and implementation and/or initial documentation

+  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.commands;

+

+import java.util.ArrayList;

+import java.util.HashMap;

+import java.util.HashSet;

+import java.util.LinkedHashSet;

+import java.util.List;

+import java.util.Map;

+import java.util.Set;

+

+import org.eclipse.emf.common.util.BasicEList;

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.emf.transaction.util.TransactionUtil;

+import org.eclipse.jface.viewers.ILabelProvider;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Assign;

+import org.eclipse.papyrus.infra.core.services.ServiceException;

+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource;

+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

+import org.eclipse.papyrus.infra.widgets.providers.FilteredContentProvider;

+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

+import org.eclipse.papyrus.infra.widgets.providers.StaticContentProvider;

+import org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.uml2.uml.Classifier;

+import org.eclipse.uml2.uml.Component;

+import org.eclipse.uml2.uml.Element;

+import org.eclipse.uml2.uml.InstanceSpecification;

+import org.eclipse.uml2.uml.Model;

+import org.eclipse.uml2.uml.Package;

+import org.polarsys.chess.chessmlprofile.Predictability.DeploymentConfiguration.HardwareBaseline.CH_HwProcessor;

+import org.polarsys.chess.core.profiles.CHESSProfileManager;

+import org.polarsys.chess.core.util.uml.ModelError;

+import org.polarsys.chess.core.util.uml.UMLUtils;

+import org.polarsys.chess.multicore.ReferenceSelectorNoDoubleClick;

+import org.polarsys.chess.multicore.dialogs.CoreSelectorDialog;

+import org.polarsys.chess.multicore.dialogs.SystemSelectionDialog;

+import org.polarsys.chess.multicore.model.AbstractCommand;

+import org.polarsys.chess.multicore.model.CHCore;

+import org.polarsys.chess.multicore.model.CHTask;

+import org.polarsys.chess.multicore.utils.GeneratorUtils;

+import org.polarsys.chess.multicore.utils.QueryUtils;

+

+/**

+ * The Class AssignTasks2CoresCommand.

+ */

+public class AssignTasks2CoresCommand extends

+AbstractCommand {

+

+	/** The tasks. */

+	private EList<CHTask> tasks;	

+	

+	/** The processors map. */

+	private Map<Package, EList<InstanceSpecification>> processorsMap =  new HashMap<Package, EList<InstanceSpecification>>();

+	

+	/** The cores map. */

+	private Map<InstanceSpecification, EList<CHCore>> coresMap = new HashMap<InstanceSpecification, EList<CHCore>>();

+	

+	/** The result. */

+	private Map<CHCore, LinkedHashSet<Object>> result;

+	

+	/** The hw system. */

+	private static Component hwSystem;

+	

+	/** The operation list. */

+	private HashMap<CHTask, EList<CHTask>> operationList;

+	

+	/** The assignments. */

+	private EList<Assign> assignments;

+	

+	/** The hw systems list. */

+	private EList<InstanceSpecification> hwSystemsList = new BasicEList<InstanceSpecification>();

+

+	

+	/**

+	 * Open selector to choose HW system where assign tasks.

+	 *

+	 * @param umlModel the uml model

+	 * @param hwSystemsList the hw systems list

+	 * @return the instance specification

+	 */

+	private static InstanceSpecification openSystemSelector (Model umlModel, 

+			EList<InstanceSpecification> hwSystemsList) {

+

+		// First of all show selector to select HwSystem

+		List<InstanceSpecification> systemSelection = new ArrayList<InstanceSpecification>();

+		for (InstanceSpecification syst : hwSystemsList) {

+			systemSelection.add(syst);

+		}

+

+		Shell activeShell = Display.getDefault().getActiveShell();

+		SystemSelectionDialog systemDialog = new SystemSelectionDialog(activeShell, systemSelection, "Select System where to assign tasks");

+		if (systemDialog.open() == Window.OK) {

+			String selectedSystemQN = systemDialog.getSystemName();

+			EList<Element> allElems = umlModel.allOwnedElements();

+			for (Element elem : allElems) {

+				InstanceSpecification theSystem;

+				if (elem instanceof InstanceSpecification) {

+					theSystem = (InstanceSpecification)elem;

+					if (theSystem.getQualifiedName()!=null && theSystem.getQualifiedName().equals(selectedSystemQN)) {							

+						Classifier classif = theSystem.getClassifiers().get(0);

+						hwSystem = (Component)classif;

+						return theSystem;

+					}				

+				}

+			}

+		}

+		return null;

+	}

+

+

+	/**

+	 * Open the Wizard window to assign tasks to Cores (for the selected HW System).

+	 *

+	 * @param tasks the tasks

+	 * @param pack the pack

+	 * @param cores the cores

+	 * @param assignments the assignments

+	 * @return the map

+	 */

+	private static Map<CHCore, LinkedHashSet<Object>> openWizard(

+			final EList<CHTask> tasks,

+			Package pack,

+			EList<CHCore> cores,

+			EList<Assign> assignments) {

+

+//		final ServicesRegistry servicesRegistry = ((IMultiDiagramEditor) (PlatformUI

+//				.getWorkbench().getActiveWorkbenchWindow().getActivePage()

+//				.getActiveEditor())).getServicesRegistry();

+		

+		ServicesRegistry servicesRegistry = null;

+		try {

+			servicesRegistry = ServiceUtilsForResource.getInstance().getServiceRegistry(pack.eResource());

+		} catch (ServiceException e1) {

+			// TODO Auto-generated catch block

+			e1.printStackTrace();

+			return null;

+		}

+

+		// Look for the tasks that are not assigned to a Processor in this package (deployment)

+		EList<CHTask> taskNotYetAssignedToCore = new BasicEList<CHTask>();

+		for (CHTask i : tasks) {

+			if (!(QueryUtils.isTaskAssigned2Core(i, pack, assignments))) {

+				taskNotYetAssignedToCore.add(i);			

+			}

+		}	

+		

+		final ReferenceSelector referenceSelector = new ReferenceSelectorNoDoubleClick(

+				true, null, taskNotYetAssignedToCore);

+

+		final IStaticContentProvider semanticProvider = new StaticContentProvider(

+				tasks.toArray());

+

+		final FilteredContentProvider filteredProvider = new FilteredContentProvider(

+				semanticProvider);		

+		referenceSelector.setContentProvider(filteredProvider);		

+

+		CoreSelectorDialog dialog = null;

+

+		ILabelProvider serv = null;

+		try {

+			serv = servicesRegistry.getService(LabelProviderService.class)

+					.getLabelProvider();

+		} catch (final ServiceException e) {

+			// Activator.log.error("LabelProviderServiceNotFound", e);

+		}

+

+		referenceSelector.setLabelProvider(serv);

+		dialog = new CoreSelectorDialog(Display.getDefault()

+				.getActiveShell(), referenceSelector, cores, pack, assignments,

+				CoreSelectorDialog.TASKS_TO_CORES,

+				"Assign Tasks to Cores");

+

+		dialog.setLabelProvider(serv);

+		//dialog.setMessage("Messages.CreateDiagramImage_LifelineDialogMessage");

+		//dialog.setTitle("Messages.CreateDiagramImage_LifelineDialogTitle");

+		// dialog.setInitialElementSelections(insts2);

+

+		if (dialog.open() == org.eclipse.jface.window.Window.OK) {

+			Map<CHCore, LinkedHashSet<Object>> result = dialog

+					.getResult();

+			if (result != null)

+				return result;

+		}

+		return null;

+	}

+

+

+	/* (non-Javadoc)

+	 * @see org.polarsys.chess.multicore.model.AbstractCommand#execute()

+	 */

+	@Override

+	public void execute() throws ModelError {

+		queryContent(umlModel);

+		printContent();		

+		

+		int howMany = hwSystemsList.size();

+		

+		InstanceSpecification theSystem = null;

+		if (howMany > 1) {

+			theSystem = openSystemSelector(umlModel, hwSystemsList);

+		}

+		else {

+			theSystem = hwSystemsList.get(0);

+		}

+		

+		if (theSystem!=null) {

+			Package pack = QueryUtils.getOwnerCHGaResourcePlatformPackage(umlModel, theSystem);

+	

+			EList<InstanceSpecification> processorList = processorsMap.get(pack);

+	

+			EList<CHCore> cores =  new BasicEList<CHCore>();

+			if (processorList!=null) {						

+				for (InstanceSpecification proc : processorList) {

+					EList<CHCore> coreList = coresMap.get(proc);

+					for (CHCore core : coreList) {

+						cores.add(core);

+					}

+				}

+			}

+	

+			result = openWizard(tasks, pack, cores, assignments);

+	

+			if (result != null) {

+				updateModel();

+			}

+		}

+	}

+

+	

+	/**

+	 * Prints the content.

+	 */

+	private void printContent() {

+		System.out.println("Tasks:");

+		for (CHTask component : tasks) {

+			System.out.println(component);

+		}		

+		Set<Package> packs = processorsMap.keySet();

+		for (Package pack: packs) {

+			System.out.println("Package: "+pack.getName());

+			EList<InstanceSpecification> procList = processorsMap.get(pack);

+			for (InstanceSpecification theProc : procList) {

+				System.out.println("Processor: "+theProc.getName());				 

+				EList<CHCore> coreList = coresMap.get(theProc);

+				for (CHCore theCore : coreList) {

+					System.out.println("Core: "+theCore.getName());

+				}

+			}

+		}

+	}

+

+	

+	/**

+	 * Update model.

+	 */

+	private void updateModel() {

+		TransactionalEditingDomain editingDomain = TransactionUtil

+				.getEditingDomain(umlModel);

+		editingDomain.getCommandStack().execute(new Com(editingDomain));

+	}

+

+	/**

+	 * Get all that is needed from the model.

+	 *

+	 * @param umlModel the uml model

+	 * @throws ModelError the model error

+	 */

+	private void queryContent(Model umlModel) throws ModelError {

+		try{

+			hwSystem = UMLUtils.getResourcePlatformComponent(umlModel, CHESSProfileManager.DEPLOYMENT_VIEW);

+		}catch (ModelError me){

+			ModelError me2 = new ModelError(me.getMessage()+" Be sure that HW root Components in the ComponentView are stereotyped with CHGaResourcePlatorm");

+			throw me2;

+		}

+

+		// Look for Packages stereotyped as CHGAResourcePlatform in the Deployment View

+		EList<Package> packages = QueryUtils.getResourcePlatformPackages(umlModel, CHESSProfileManager.DEPLOYMENT_VIEW);		

+

+		if (packages.size()==0) {

+			ModelError me = new ModelError("Error in model: no Package stereotyped as CHGAResourcePlatform in the Deployment View!");

+			throw me;

+		}

+		hwSystemsList = new BasicEList<InstanceSpecification>();

+		

+ 		for(Package pack : packages) {		

+			EList<InstanceSpecification> processors = new BasicEList<InstanceSpecification>();

+			for (CH_HwProcessor ch_processor : QueryUtils.getAllProcessorInstancesInPackage(pack)) {

+				InstanceSpecification instSpec = ch_processor.getBase_InstanceSpecification();

+				processors.add(instSpec);				

+				EList<CHCore> theCores = QueryUtils.getCores(ch_processor);

+				coresMap.put(instSpec, theCores);				

+			}

+			InstanceSpecification theSystem = UMLUtils.getRootInstanceInPackage(pack);

+			hwSystemsList.add(theSystem);

+			processorsMap.put(pack, processors);

+		}

+ 		

+ 		if (hwSystemsList.isEmpty()) {

+ 			ModelError me = new ModelError("Error in model: no System in the Deployment View!");

+			throw me;

+ 		}

+

+		EList<InstanceSpecification> instances = UMLUtils.getAllComponentInstances(umlModel, true);

+		tasks = QueryUtils.getCHTasksList(instances);

+

+		operationList = QueryUtils.getOperationChain(umlModel, tasks);

+		assignments = UMLUtils.getTask2CoreAssignments(umlModel, CHESSProfileManager.DEPLOYMENT_VIEW);

+	}

+

+	/**

+	 * The Class Com.

+	 */

+	class Com extends RecordingCommand {

+

+		/** The assigned operations. */

+		private HashSet<CHTask> assignedOperations;

+

+		/**

+		 * Instantiates a new com.

+		 *

+		 * @param domain the domain

+		 */

+		public Com(TransactionalEditingDomain domain) {

+			super(domain);

+		}

+

+		/* (non-Javadoc)

+		 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()

+		 */

+		@Override

+		protected void doExecute() {

+

+			Map<CHCore, LinkedHashSet<Object>> core2chtask = new HashMap<CHCore, LinkedHashSet<Object>>();

+

+			for (CHCore core : result.keySet()) {

+				assignedOperations = new HashSet<CHTask>();

+				LinkedHashSet<Object> list = new LinkedHashSet<Object>();

+				for (Object task : result.get(core)) {

+					CHTask owningTask = (CHTask) task;

+					list.add(owningTask);

+					addRelatedOperations(owningTask, list);

+				}

+				core2chtask.put(core, list);

+			}	

+

+			QueryUtils.deleteTask2CoreAssociations(hwSystem);

+			GeneratorUtils.buildTask2CoreAssociations(hwSystem, core2chtask);

+		}

+

+		//the related operations of a task are assigned to the same core of the task,

+		/**

+		 * Adds the related operations.

+		 *

+		 * @param owningTask the owning task

+		 * @param list the list

+		 */

+		//TODO for now every operation shared by multiple tasks is assigned to the same core of the first task that was processed

+		private void addRelatedOperations(CHTask owningTask, LinkedHashSet<Object> list) {

+			for (CHTask operation : operationList.get(owningTask)) {

+				if(!assignedOperations.contains(operation)) {

+					list.add(operation);

+					assignedOperations.add(operation);

+				}

+			}

+		}

+	}

+}

diff --git a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/commands/GenerateTask2CoreAssignmentsCommand.java b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/commands/GenerateTask2CoreAssignmentsCommand.java
index de33e2b..3464893 100644
--- a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/commands/GenerateTask2CoreAssignmentsCommand.java
+++ b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/commands/GenerateTask2CoreAssignmentsCommand.java
@@ -1,556 +1,563 @@
-/*------------------------------------------------------------------------------
-  -
-  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 
-  - 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:
-  -
-  - Alessandro Zovi azovi@math.unipd.it
-  - Stefano Puri stefano.puri@intecs.it
-  - Laura Baracchi laura.baracchi@intecs.it
-  - Nicholas Pacini nicholas.pacini@intecs.it  
-  -
-  - Initial API and implementation and/or initial documentation
-  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.commands;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.uml2.uml.Classifier;
-import org.eclipse.uml2.uml.Component;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.uml2.uml.Model;
-import org.eclipse.uml2.uml.Package;
-import org.polarsys.chess.chessmlprofile.Predictability.DeploymentConfiguration.HardwareBaseline.CH_HwProcessor;
-import org.polarsys.chess.chessmlprofile.Predictability.RTComponentModel.CHRtSpecification;
-import org.polarsys.chess.core.profiles.CHESSProfileManager;
-import org.polarsys.chess.core.util.uml.ModelError;
-import org.polarsys.chess.core.util.uml.UMLUtils;
-import org.polarsys.chess.multicore.dialogs.SystemSelectionDialog;
-import org.polarsys.chess.multicore.model.AbstractCommand;
-import org.polarsys.chess.multicore.model.CHCore;
-import org.polarsys.chess.multicore.model.CHTask;
-import org.polarsys.chess.multicore.model.SupertaskInfo;
-import org.polarsys.chess.multicore.partitioning.Bin;
-import org.polarsys.chess.multicore.partitioning.BinPackerFactory;
-import org.polarsys.chess.multicore.partitioning.RUNReduction;
-import org.polarsys.chess.multicore.partitioning.Task;
-import org.polarsys.chess.multicore.utils.GeneratorUtils;
-import org.polarsys.chess.multicore.utils.QueryUtils;
-import org.polarsys.chess.multicore.utils.QueryUtils.OccKindInfo;
-import org.polarsys.chess.validator.constraints.StringParser;
-
-/**
- * The Class GenerateTask2CoreAssignmentsCommand.
- */
-public class GenerateTask2CoreAssignmentsCommand extends AbstractCommand {
-	
-	/** The operation list. */
-	private HashMap<CHTask, EList<CHTask>> operationList;
-
-	/** The core 2 chtask. */
-	private Map<CHCore, LinkedHashSet<Object>> core2chtask;
-
-	/** The processors. */
-	private EList<InstanceSpecification> processors;
-
-	/** The cores. */
-	private EList<CHCore> cores = new BasicEList<CHCore>();
-
-	/** The assigned operations. */
-	private Set<CHTask> assignedOperations = new HashSet<CHTask>();
-
-	/** The processors map. */
-	private Map<Package, EList<InstanceSpecification>> processorsMap = new HashMap<Package, EList<InstanceSpecification>>();
-	
-	/** The cores map. */
-	private Map<InstanceSpecification, EList<CHCore>> coresMap = new HashMap<InstanceSpecification, EList<CHCore>>();
-	
-	/** The hw system. */
-	private static Component hwSystem;
-	
-	/** The hw systems list. */
-	private EList<InstanceSpecification> hwSystemsList = new BasicEList<InstanceSpecification>();
-
-	/** The use RUN. */
-	private boolean useRUN;
-
-	/** The supertask info list. */
-	private List<SupertaskInfo> supertaskInfoList;
-
-	/** The core 2 supertask. */
-	private HashMap<SupertaskInfo, LinkedHashSet<Object>> core2supertask;
-
-	/**
-	 * Open selector to choose HW system where assign tasks.
-	 *
-	 * @param umlModel the uml model
-	 * @param hwSystemsList the hw systems list
-	 * @return the instance specification
-	 */
-	private static InstanceSpecification openSystemSelector(Model umlModel, EList<InstanceSpecification> hwSystemsList) {
-
-		// First of all show selector to select HwSystem
-		List<InstanceSpecification> systemSelection = new ArrayList<InstanceSpecification>();
-		for (InstanceSpecification syst : hwSystemsList) {
-			systemSelection.add(syst);
-		}
-
-		Shell activeShell = Display.getDefault().getActiveShell();
-		SystemSelectionDialog systemDialog = new SystemSelectionDialog(activeShell, systemSelection, "Select System where to assign tasks");
-		if (systemDialog.open() == Window.OK) {
-			String selectedSystemQN = systemDialog.getSystemName();
-			EList<Element> allElems = umlModel.allOwnedElements();
-			for (Element elem : allElems) {
-				InstanceSpecification theSystem;
-				if (elem instanceof InstanceSpecification) {
-					theSystem = (InstanceSpecification) elem;
-					if (theSystem.getQualifiedName() != null && theSystem.getQualifiedName().equals(selectedSystemQN)) {
-						Classifier classif = theSystem.getClassifiers().get(0);
-						hwSystem = (Component) classif;
-						return theSystem;
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.polarsys.chess.multicore.model.AbstractCommand#execute()
-	 */
-	@Override
-	public void execute() throws ModelError {
-		queryContent(umlModel);
-
-		int howMany = hwSystemsList.size();
-
-		InstanceSpecification theSystem = null;
-		if (howMany > 1) {
-			theSystem = openSystemSelector(umlModel, hwSystemsList);
-		} else {
-			theSystem = hwSystemsList.get(0);
-		}
-
-		if (theSystem != null) {
-			Package pack = QueryUtils.getOwnerCHGaResourcePlatformPackage(umlModel, theSystem);
-
-			EList<InstanceSpecification> processorList = processorsMap.get(pack);
-
-			cores = new BasicEList<CHCore>();
-			if (processorList != null) {
-				for (InstanceSpecification proc : processorList) {
-					EList<CHCore> coreList = coresMap.get(proc);
-					for (CHCore core : coreList) {
-						cores.add(core);
-					}
-				}
-			}
-
-			executeTask2CoreCalculator(false);
-
-			// printContent();
-			if (core2chtask != null) {
-				updateModel();
-			}
-		}
-	}
-
-	/**
-	 * Execute task 2 core calculator.
-	 *
-	 * @param forceUseOfRUN the force use of RUN
-	 * @throws ModelError the model error
-	 */
-	protected void executeTask2CoreCalculator(boolean forceUseOfRUN) throws ModelError {
-
-		List<Bin> allBins = new ArrayList<Bin>();
-		List<Task> allTasks = new ArrayList<Task>();
-		System.out.format("We have %d cores\n", cores.size());
-		// init bins
-		for (int i = 0; i < cores.size(); i++)
-			allBins.add(new Bin(i));
-
-		for (CHTask chRtSpecification : operationList.keySet()) {
-
-			String occKind = chRtSpecification.getCHRtSpecification().getOccKind();
-			OccKindInfo info = QueryUtils.getOccKindInfo(occKind);
-
-			double c_ = QueryUtils.getWCET(chRtSpecification.getCHRtSpecification());
-			/* add the wcet for each operation relative to this chrtspec */
-			for (CHTask spec : operationList.get(chRtSpecification)) {
-				double c_1 = QueryUtils.getWCET(spec.getCHRtSpecification());
-				c_ += c_1;
-			}
-			StringParser sp = new StringParser();
-			double d_ = sp.getValueNFP(chRtSpecification.getCHRtSpecification().getRlDl());
-			double t_ = info.value;
-
-			// d_ = xxx.remove(0);
-			// t_ = d_;
-
-			String name = getTaskID(chRtSpecification.getCHRtSpecification());
-
-			float c = (float) c_;// exec time
-			float d = (float) d_;// deadline
-			float t = (float) t_;// period
-			float o = 0;// TODO insert offset in stereotype
-
-			double u_ = c / t;
-			float u = (float) u_;
-
-			System.out.println("Task " + name + " -> " + c + " " + d + " " + t + " -> " + u);
-			allTasks.add(new Task(name, new Float(c), new Float(d), new Float(t), new Float(o), null));
-
-		}
-
-		Map<Bin, List<Task>> firstPack = BinPackerFactory.getBinPacker(org.polarsys.chess.multicore.partitioning.Heuristic.WORST_FIT).pack(allBins, allTasks);
-		Map<Bin, List<Task>> reductionTree = new Hashtable<Bin, List<Task>>(firstPack);
-
-		useRUN = reductionTree.size() > allBins.size();
-		if (forceUseOfRUN)
-			useRUN = true;
-
-		if (useRUN) {
-			System.out.println("Starting RUN packing");
-			allTasks = new ArrayList<Task>();
-			for (Bin bin : reductionTree.keySet())
-				allTasks.add(new Task(bin.getId().toString(), bin.getCapacity()));
-			reductionTree = new RUNReduction().pack(null, allTasks);
-			for (java.util.Map.Entry<Bin, List<Task>> row : reductionTree.entrySet()) {
-				System.out.print("LEVEL " + row.getKey().getLevel() + "-" + row.getKey().getId() + "(U=" + row.getKey().getCapacity() + ") -> {");
-				for (Task t : row.getValue())
-					System.out.print(" " + t.getId() + ",");
-				System.out.println("}");
-			}
-			buildRUNAssociations(firstPack, reductionTree);
-		} else
-			// Build model results
-			buildAssociations(firstPack);
-	}
-
-	/**
-	 * Builds the RUN associations.
-	 *
-	 * @param firstPack the first pack
-	 * @param reductionTree the reduction tree
-	 * @throws ModelError the model error
-	 */
-	private void buildRUNAssociations(Map<Bin, List<Task>> firstPack, Map<Bin, List<Task>> reductionTree) throws ModelError {
-		// add chtasks which represent real tasks to the core map and add the
-		// related operation chain to the same core
-		// TODO solve the following problem: the related operations may be shared
-		// between tasks which can be assigned to different cores!
-
-		core2supertask = new HashMap<SupertaskInfo, LinkedHashSet<Object>>();
-
-		Object[] firstPackSorted = firstPack.entrySet().toArray();
-		Arrays.sort(firstPackSorted, new Comparator<Object>() {
-
-			@Override
-			public int compare(Object o1, Object o2) {
-				if (((Entry<Bin, List<Task>>) o1).getKey().getId() > ((Entry<Bin, List<Task>>) o2).getKey().getId())
-					return 1;
-				else if (((Entry<Bin, List<Task>>) o1).getKey().getId() < ((Entry<Bin, List<Task>>) o2).getKey().getId())
-					return -1;
-				else
-					return 0;
-			}
-		});
-
-		Object[] allBins = reductionTree.keySet().toArray();
-		Arrays.sort(allBins, new Comparator<Object>() {
-
-			@Override
-			public int compare(Object o1, Object o2) {
-				if (((Bin) o1).getLevel() > ((Bin) o2).getLevel())
-					return -1;
-				else if (((Bin) o1).getLevel() < ((Bin) o2).getLevel())
-					return 1;
-				else
-					return 0;
-			}
-		});
-
-		// DEPTH-FIRST print
-		// root level
-
-		CH_HwProcessor procInstance = QueryUtils.getAllProcessorInstances(umlModel).get(0);
-
-		int maxLevel = ((Bin) allBins[0]).getLevel();
-		System.out.println("-- Primary Schedulers\n");
-		System.out.println("Scheduler (");
-		System.out.println("	Type	=> Primary_Scheduler,");
-		System.out.println("	Name	=> Scheduler_1,");
-		System.out.println("	Policy	=> ( Type => RUN ),");
-		System.out.println("	Host	=> Multicore_1 );");// TODO: depends on CHRT
-		// specification
-		System.out.println("\n-- Primary Scheduling Servers and Secondary Schedulers\n");
-		int indexSupertask = 0;
-		// all levels of the tree in the interval (root,0]
-		supertaskInfoList = new ArrayList<SupertaskInfo>();
-		for (int i = 1; (i < allBins.length) && (((Bin) allBins[i]).getLevel() >= 0); i++) {
-			createSupertaskInfo(procInstance, indexSupertask, ((Bin) allBins[i]).getCapacity());
-
-			assignedOperations = new HashSet<CHTask>();
-			// first pack: print leaf nodes
-			if (((Bin) allBins[i]).getLevel() == 0) {
-				List<Task> tasks = reductionTree.get(((Bin) allBins[i]));
-				LinkedHashSet<Object> list = new LinkedHashSet<Object>();
-				for (Task task : tasks) {
-					List<Task> leaves = ((Entry<Bin, List<Task>>) firstPackSorted[new Integer(task.getId())]).getValue();
-					for (Task leaf : leaves) {
-						System.out.println("Scheduling_Server (");
-						System.out.println("	Type				=> Regular,");
-						System.out.println("	Name 				=> " + leaf.getId() + ",");
-						System.out.println("	Server_Sched_Parameters		=> (");
-						System.out.println("		Type			=> EDF_policy,");
-						System.out.println("		Deadline		=> " + leaf.getT() + ",");
-						System.out.println("                Preassigned             => No),");
-						System.out.println("	Scheduler			=> SecondaryScheduler_" + indexSupertask + ");");
-						System.out.println();
-
-						CHTask owningTask = getCHRTFromTask(leaf);
-						list.add(owningTask);
-						addRelatedOperations(owningTask, list);
-
-					}
-
-				}
-				core2supertask.put(supertaskInfoList.get(indexSupertask), list);
-			}
-			indexSupertask++;
-		}
-	}
-
-	/**
-	 * Creates the supertask info.
-	 *
-	 * @param ch_HwProcessor the ch hw processor
-	 * @param indexSupertask the index supertask
-	 * @param capacity the capacity
-	 */
-	private void createSupertaskInfo(CH_HwProcessor ch_HwProcessor, int indexSupertask, Float capacity) {
-		SupertaskInfo si = new SupertaskInfo(ch_HwProcessor.getBase_InstanceSpecification(), "SuperTask_" + indexSupertask, capacity);
-		supertaskInfoList.add(si);
-		System.out.println("--*************** BRANCH ***************");
-		System.out.println("Scheduling_Server (");
-		System.out.println("	Type				=> Regular,");
-		System.out.println("	Name				=> SuperTask_" + indexSupertask + ",");
-		System.out.println("	Server_Sched_parameters		=> ( Type => RUN_Supertask,");
-		System.out.println("					     Utilization => " + capacity + " ),"); // FIXME:
-		// utilization
-		// is
-		// not
-		// expressed
-		// as U
-		// in
-		// Geoffrey's
-		// example
-		System.out.println("	Scheduler			=> Scheduler_1 );");
-		System.out.println();
-		System.out.println("Scheduler (");
-		System.out.println("	Type	=> Secondary_Scheduler,");
-		System.out.println("	Name	=> SecondaryScheduler_" + indexSupertask + ",");
-		System.out.println("	Policy	=> ( 	Type	=> EDF,");
-		System.out.println("			Worst_Context_Switch	=> 20 ),");// FIXME: based on
-		// Compagnin paper
-		// at ECRTS2014
-		System.out.println("	Server	=> SuperTask_" + indexSupertask + " );");
-		System.out.println();
-	}
-
-	/**
-	 * Builds the associations.
-	 *
-	 * @param firstPack the first pack
-	 */
-	public void buildAssociations(Map<Bin, List<Task>> firstPack) {
-		// add chtasks which represent real tasks to the core map and add the
-		// related operation chain to the same core
-		// TODO solve the following problem: the related operations may be shared
-		// between tasks which can be assigned to different cores!
-
-		core2chtask = new HashMap<CHCore, LinkedHashSet<Object>>();
-		int coreIndex = 0;
-		for (Bin core : firstPack.keySet()) {
-			assignedOperations = new HashSet<CHTask>();
-			LinkedHashSet<Object> list = new LinkedHashSet<Object>();
-			for (Task task : firstPack.get(core)) {
-				CHTask owningTask = getCHRTFromTask(task);
-				list.add(owningTask);
-				addRelatedOperations(owningTask, list);
-			}
-			core2chtask.put(cores.get(coreIndex++), list);
-		}
-	}
-
-	// the related operations of a task are assigned to the same core of the task,
-	// TODO for now every operation shared by multiple tasks is assigned to the
-	/**
-	 * Adds the related operations.
-	 *
-	 * @param owningTask the owning task
-	 * @param list the list
-	 */
-	// same core of the first task that was processed
-	private void addRelatedOperations(CHTask owningTask, LinkedHashSet<Object> list) {
-		for (CHTask operation : operationList.get(owningTask)) {
-			if (!assignedOperations.contains(operation)) {
-				list.add(operation);
-				assignedOperations.add(operation);
-			}
-		}
-	}
-
-	/**
-	 * Gets the task ID.
-	 *
-	 * @param chRtSpecification the ch rt specification
-	 * @return the task ID
-	 */
-	private String getTaskID(CHRtSpecification chRtSpecification) {
-		return chRtSpecification.getContext().getName() + UMLUtils.getElementID(chRtSpecification.getContext());
-	}
-
-	/**
-	 * Gets the CHRT from task.
-	 *
-	 * @param task the task
-	 * @return the CHRT from task
-	 */
-	private CHTask getCHRTFromTask(Task task) {
-		for (CHTask chtask : operationList.keySet()) {
-			if (getTaskID(chtask.getCHRtSpecification()).equals(task.getId()))
-				return chtask;
-		}
-		return null;
-	}
-
-	/**
-	 * Prints the content.
-	 */
-	private void printContent() {
-		System.out.println("Tasks:");
-		for (CHTask chtask : operationList.keySet()) {
-			System.out.println(chtask);
-		}
-	}
-
-	/**
-	 * Update model.
-	 */
-	protected void updateModel() {
-		boolean b1 = core2chtask != null && !core2chtask.isEmpty();
-		boolean b2 = core2supertask != null && !core2supertask.isEmpty();
-
-		if (b1 || b2) {
-
-			TransactionalEditingDomain editingDomain = TransactionUtil.getEditingDomain(umlModel);
-			editingDomain.getCommandStack().execute(new Com(editingDomain));
-		}
-	}
-
-	/**
-	 * Query content.
-	 *
-	 * @param owner the owner
-	 * @throws ModelError the model error
-	 */
-	protected void queryContent(Model owner) throws ModelError {
-		EList<CH_HwProcessor> x = QueryUtils.getAllProcessorInstances(umlModel);
-		x = QueryUtils.filterMultiCoreProcessors(x);
-		if (x.size() > 1)
-			throw new ModelError("Assignment generation works only on single processor systems");
-
-		// Look for Packages stereotyped as CHGAResourcePlatform in the Deployment
-		// View
-		EList<Package> packages = QueryUtils.getResourcePlatformPackages(umlModel, CHESSProfileManager.DEPLOYMENT_VIEW);
-
-		if (packages.size() == 0) {
-			ModelError me = new ModelError("Error in model: no Package stereotyped as CHGAResourcePlatform in the Deployment View!");
-			throw me;
-		}
-		hwSystemsList = new BasicEList<InstanceSpecification>();
-
-		for (Package pack : packages) {
-			EList<InstanceSpecification> processors = new BasicEList<InstanceSpecification>();
-			for (CH_HwProcessor ch_processor : QueryUtils.getAllProcessorInstancesInPackage(pack)) {
-				InstanceSpecification instSpec = ch_processor.getBase_InstanceSpecification();
-				processors.add(instSpec);
-				EList<CHCore> theCores = QueryUtils.getCores(ch_processor);
-				coresMap.put(instSpec, theCores);
-				cores.addAll(theCores);
-			}
-			InstanceSpecification theSystem = UMLUtils.getRootInstanceInPackage(pack);
-			hwSystemsList.add(theSystem);
-			processorsMap.put(pack, processors);
-		}
-
-		if (hwSystemsList.isEmpty()) {
-			ModelError me = new ModelError("Error in model: no System in the Deployment View!");
-			throw me;
-		}
-
-		EList<InstanceSpecification> instances = UMLUtils.getAllComponentInstances(umlModel, true);
-		EList<CHTask> chtasks = QueryUtils.getCHTasksList(instances);
-
-		operationList = QueryUtils.getOperationChain(umlModel, chtasks);
-
-	}
-
-	/**
-	 * The Class Com.
-	 */
-	class Com extends RecordingCommand {
-
-		/**
-		 * Instantiates a new com.
-		 *
-		 * @param domain the domain
-		 */
-		public Com(TransactionalEditingDomain domain) {
-			super(domain);
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()
-		 */
-		@Override
-		protected void doExecute() {
-			try {
-				QueryUtils.deleteTask2CoreAssociations(hwSystem);
-				if (!useRUN)
-					GeneratorUtils.buildTask2CoreAssociations(hwSystem, core2chtask);
-				else
-					GeneratorUtils.buildTask2SuperTaskAssociations(hwSystem, core2supertask, supertaskInfoList);
-
-			} catch (Exception e) {
-				throw new OperationCanceledException(e.getMessage());
-			}
-		}
-	}
-
-}
\ No newline at end of file
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+/*------------------------------------------------------------------------------

+  -

+  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 

+  - All rights reserved. This program and the accompanying materials

+  - are made available under the terms of the Eclipse Public License v2.0

+  - which accompanies this distribution, and is available at

+  - http://www.eclipse.org/legal/epl-v20.html

+  -

+  - Contributors:

+  -

+  - Alessandro Zovi azovi@math.unipd.it

+  - Stefano Puri stefano.puri@intecs.it

+  - Laura Baracchi laura.baracchi@intecs.it

+  - Nicholas Pacini nicholas.pacini@intecs.it  

+  -

+  - Initial API and implementation and/or initial documentation

+  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.commands;

+

+import java.util.ArrayList;

+import java.util.Arrays;

+import java.util.Comparator;

+import java.util.HashMap;

+import java.util.HashSet;

+import java.util.Hashtable;

+import java.util.LinkedHashSet;

+import java.util.List;

+import java.util.Map;

+import java.util.Set;

+import java.util.Map.Entry;

+

+import org.eclipse.core.runtime.OperationCanceledException;

+import org.eclipse.emf.common.util.BasicEList;

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.emf.transaction.util.TransactionUtil;

+import org.eclipse.jface.window.Window;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.uml2.uml.Classifier;

+import org.eclipse.uml2.uml.Component;

+import org.eclipse.uml2.uml.Element;

+import org.eclipse.uml2.uml.InstanceSpecification;

+import org.eclipse.uml2.uml.Model;

+import org.eclipse.uml2.uml.Package;

+import org.polarsys.chess.chessmlprofile.Predictability.DeploymentConfiguration.HardwareBaseline.CH_HwProcessor;

+import org.polarsys.chess.chessmlprofile.Predictability.RTComponentModel.CHRtSpecification;

+import org.polarsys.chess.core.profiles.CHESSProfileManager;

+import org.polarsys.chess.core.util.uml.ModelError;

+import org.polarsys.chess.core.util.uml.UMLUtils;

+import org.polarsys.chess.multicore.dialogs.SystemSelectionDialog;

+import org.polarsys.chess.multicore.model.AbstractCommand;

+import org.polarsys.chess.multicore.model.CHCore;

+import org.polarsys.chess.multicore.model.CHTask;

+import org.polarsys.chess.multicore.model.SupertaskInfo;

+import org.polarsys.chess.multicore.partitioning.Bin;

+import org.polarsys.chess.multicore.partitioning.BinPackerFactory;

+import org.polarsys.chess.multicore.partitioning.RUNReduction;

+import org.polarsys.chess.multicore.partitioning.Task;

+import org.polarsys.chess.multicore.utils.GeneratorUtils;

+import org.polarsys.chess.multicore.utils.QueryUtils;

+import org.polarsys.chess.multicore.utils.QueryUtils.OccKindInfo;

+import org.polarsys.chess.validator.constraints.StringParser;

+

+/**

+ * The Class GenerateTask2CoreAssignmentsCommand.

+ */

+public class GenerateTask2CoreAssignmentsCommand extends AbstractCommand {

+	

+	/** The operation list. */

+	private HashMap<CHTask, EList<CHTask>> operationList;

+

+	/** The core 2 chtask. */

+	private Map<CHCore, LinkedHashSet<Object>> core2chtask;

+

+	/** The processors. */

+	private EList<InstanceSpecification> processors;

+

+	/** The cores. */

+	private EList<CHCore> cores = new BasicEList<CHCore>();

+

+	/** The assigned operations. */

+	private Set<CHTask> assignedOperations = new HashSet<CHTask>();

+

+	/** The processors map. */

+	private Map<Package, EList<InstanceSpecification>> processorsMap = new HashMap<Package, EList<InstanceSpecification>>();

+	

+	/** The cores map. */

+	private Map<InstanceSpecification, EList<CHCore>> coresMap = new HashMap<InstanceSpecification, EList<CHCore>>();

+	

+	/** The hw system. */

+	private static Component hwSystem;

+	

+	/** The hw systems list. */

+	private EList<InstanceSpecification> hwSystemsList = new BasicEList<InstanceSpecification>();

+

+	/** The use RUN. */

+	private boolean useRUN;

+

+	/** The supertask info list. */

+	private List<SupertaskInfo> supertaskInfoList;

+

+	/** The core 2 supertask. */

+	private HashMap<SupertaskInfo, LinkedHashSet<Object>> core2supertask;

+

+	/**

+	 * Open selector to choose HW system where assign tasks.

+	 *

+	 * @param umlModel the uml model

+	 * @param hwSystemsList the hw systems list

+	 * @return the instance specification

+	 */

+	private static InstanceSpecification openSystemSelector(Model umlModel, EList<InstanceSpecification> hwSystemsList) {

+

+		// First of all show selector to select HwSystem

+		List<InstanceSpecification> systemSelection = new ArrayList<InstanceSpecification>();

+		for (InstanceSpecification syst : hwSystemsList) {

+			systemSelection.add(syst);

+		}

+

+		Shell activeShell = Display.getDefault().getActiveShell();

+		SystemSelectionDialog systemDialog = new SystemSelectionDialog(activeShell, systemSelection, "Select System where to assign tasks");

+		if (systemDialog.open() == Window.OK) {

+			String selectedSystemQN = systemDialog.getSystemName();

+			EList<Element> allElems = umlModel.allOwnedElements();

+			for (Element elem : allElems) {

+				InstanceSpecification theSystem;

+				if (elem instanceof InstanceSpecification) {

+					theSystem = (InstanceSpecification) elem;

+					if (theSystem.getQualifiedName() != null && theSystem.getQualifiedName().equals(selectedSystemQN)) {

+						Classifier classif = theSystem.getClassifiers().get(0);

+						hwSystem = (Component) classif;

+						return theSystem;

+					}

+				}

+			}

+		}

+		return null;

+	}

+

+	/* (non-Javadoc)

+	 * @see org.polarsys.chess.multicore.model.AbstractCommand#execute()

+	 */

+	@Override

+	public void execute() throws ModelError {

+		queryContent(umlModel);

+

+		int howMany = hwSystemsList.size();

+

+		InstanceSpecification theSystem = null;

+		if (howMany > 1) {

+			theSystem = openSystemSelector(umlModel, hwSystemsList);

+		} else {

+			theSystem = hwSystemsList.get(0);

+		}

+

+		if (theSystem != null) {

+			Package pack = QueryUtils.getOwnerCHGaResourcePlatformPackage(umlModel, theSystem);

+

+			EList<InstanceSpecification> processorList = processorsMap.get(pack);

+

+			cores = new BasicEList<CHCore>();

+			if (processorList != null) {

+				for (InstanceSpecification proc : processorList) {

+					EList<CHCore> coreList = coresMap.get(proc);

+					for (CHCore core : coreList) {

+						cores.add(core);

+					}

+				}

+			}

+

+			executeTask2CoreCalculator(false);

+

+			// printContent();

+			if (core2chtask != null) {

+				updateModel();

+			}

+		}

+	}

+

+	/**

+	 * Execute task 2 core calculator.

+	 *

+	 * @param forceUseOfRUN the force use of RUN

+	 * @throws ModelError the model error

+	 */

+	protected void executeTask2CoreCalculator(boolean forceUseOfRUN) throws ModelError {

+

+		List<Bin> allBins = new ArrayList<Bin>();

+		List<Task> allTasks = new ArrayList<Task>();

+		System.out.format("We have %d cores\n", cores.size());

+		// init bins

+		for (int i = 0; i < cores.size(); i++)

+			allBins.add(new Bin(i));

+

+		for (CHTask chRtSpecification : operationList.keySet()) {

+

+			String occKind = chRtSpecification.getCHRtSpecification().getOccKind();

+			OccKindInfo info = QueryUtils.getOccKindInfo(occKind);

+

+			double c_ = QueryUtils.getWCET(chRtSpecification.getCHRtSpecification());

+			/* add the wcet for each operation relative to this chrtspec */

+			for (CHTask spec : operationList.get(chRtSpecification)) {

+				double c_1 = QueryUtils.getWCET(spec.getCHRtSpecification());

+				c_ += c_1;

+			}

+			StringParser sp = new StringParser();

+			double d_ = sp.getValueNFP(chRtSpecification.getCHRtSpecification().getRlDl());

+			double t_ = info.value;

+

+			// d_ = xxx.remove(0);

+			// t_ = d_;

+

+			String name = getTaskID(chRtSpecification.getCHRtSpecification());

+

+			float c = (float) c_;// exec time

+			float d = (float) d_;// deadline

+			float t = (float) t_;// period

+			float o = 0;// TODO insert offset in stereotype

+

+			double u_ = c / t;

+			float u = (float) u_;

+

+			System.out.println("Task " + name + " -> " + c + " " + d + " " + t + " -> " + u);

+			allTasks.add(new Task(name, new Float(c), new Float(d), new Float(t), new Float(o), null));

+

+		}

+

+		Map<Bin, List<Task>> firstPack = BinPackerFactory.getBinPacker(org.polarsys.chess.multicore.partitioning.Heuristic.WORST_FIT).pack(allBins, allTasks);

+		Map<Bin, List<Task>> reductionTree = new Hashtable<Bin, List<Task>>(firstPack);

+

+		useRUN = reductionTree.size() > allBins.size();

+		if (forceUseOfRUN)

+			useRUN = true;

+

+		if (useRUN) {

+			System.out.println("Starting RUN packing");

+			allTasks = new ArrayList<Task>();

+			for (Bin bin : reductionTree.keySet())

+				allTasks.add(new Task(bin.getId().toString(), bin.getCapacity()));

+			reductionTree = new RUNReduction().pack(null, allTasks);

+			for (java.util.Map.Entry<Bin, List<Task>> row : reductionTree.entrySet()) {

+				System.out.print("LEVEL " + row.getKey().getLevel() + "-" + row.getKey().getId() + "(U=" + row.getKey().getCapacity() + ") -> {");

+				for (Task t : row.getValue())

+					System.out.print(" " + t.getId() + ",");

+				System.out.println("}");

+			}

+			buildRUNAssociations(firstPack, reductionTree);

+		} else

+			// Build model results

+			buildAssociations(firstPack);

+	}

+

+	/**

+	 * Builds the RUN associations.

+	 *

+	 * @param firstPack the first pack

+	 * @param reductionTree the reduction tree

+	 * @throws ModelError the model error

+	 */

+	private void buildRUNAssociations(Map<Bin, List<Task>> firstPack, Map<Bin, List<Task>> reductionTree) throws ModelError {

+		// add chtasks which represent real tasks to the core map and add the

+		// related operation chain to the same core

+		// TODO solve the following problem: the related operations may be shared

+		// between tasks which can be assigned to different cores!

+

+		core2supertask = new HashMap<SupertaskInfo, LinkedHashSet<Object>>();

+

+		Object[] firstPackSorted = firstPack.entrySet().toArray();

+		Arrays.sort(firstPackSorted, new Comparator<Object>() {

+

+			@Override

+			public int compare(Object o1, Object o2) {

+				if (((Entry<Bin, List<Task>>) o1).getKey().getId() > ((Entry<Bin, List<Task>>) o2).getKey().getId())

+					return 1;

+				else if (((Entry<Bin, List<Task>>) o1).getKey().getId() < ((Entry<Bin, List<Task>>) o2).getKey().getId())

+					return -1;

+				else

+					return 0;

+			}

+		});

+

+		Object[] allBins = reductionTree.keySet().toArray();

+		Arrays.sort(allBins, new Comparator<Object>() {

+

+			@Override

+			public int compare(Object o1, Object o2) {

+				if (((Bin) o1).getLevel() > ((Bin) o2).getLevel())

+					return -1;

+				else if (((Bin) o1).getLevel() < ((Bin) o2).getLevel())

+					return 1;

+				else

+					return 0;

+			}

+		});

+

+		// DEPTH-FIRST print

+		// root level

+

+		CH_HwProcessor procInstance = QueryUtils.getAllProcessorInstances(umlModel).get(0);

+

+		int maxLevel = ((Bin) allBins[0]).getLevel();

+		System.out.println("-- Primary Schedulers\n");

+		System.out.println("Scheduler (");

+		System.out.println("	Type	=> Primary_Scheduler,");

+		System.out.println("	Name	=> Scheduler_1,");

+		System.out.println("	Policy	=> ( Type => RUN ),");

+		System.out.println("	Host	=> Multicore_1 );");// TODO: depends on CHRT

+		// specification

+		System.out.println("\n-- Primary Scheduling Servers and Secondary Schedulers\n");

+		int indexSupertask = 0;

+		// all levels of the tree in the interval (root,0]

+		supertaskInfoList = new ArrayList<SupertaskInfo>();

+		for (int i = 1; (i < allBins.length) && (((Bin) allBins[i]).getLevel() >= 0); i++) {

+			createSupertaskInfo(procInstance, indexSupertask, ((Bin) allBins[i]).getCapacity());

+

+			assignedOperations = new HashSet<CHTask>();

+			// first pack: print leaf nodes

+			if (((Bin) allBins[i]).getLevel() == 0) {

+				List<Task> tasks = reductionTree.get(((Bin) allBins[i]));

+				LinkedHashSet<Object> list = new LinkedHashSet<Object>();

+				for (Task task : tasks) {

+					List<Task> leaves = ((Entry<Bin, List<Task>>) firstPackSorted[new Integer(task.getId())]).getValue();

+					for (Task leaf : leaves) {

+						System.out.println("Scheduling_Server (");

+						System.out.println("	Type				=> Regular,");

+						System.out.println("	Name 				=> " + leaf.getId() + ",");

+						System.out.println("	Server_Sched_Parameters		=> (");

+						System.out.println("		Type			=> EDF_policy,");

+						System.out.println("		Deadline		=> " + leaf.getT() + ",");

+						System.out.println("                Preassigned             => No),");

+						System.out.println("	Scheduler			=> SecondaryScheduler_" + indexSupertask + ");");

+						System.out.println();

+

+						CHTask owningTask = getCHRTFromTask(leaf);

+						list.add(owningTask);

+						addRelatedOperations(owningTask, list);

+

+					}

+

+				}

+				core2supertask.put(supertaskInfoList.get(indexSupertask), list);

+			}

+			indexSupertask++;

+		}

+	}

+

+	/**

+	 * Creates the supertask info.

+	 *

+	 * @param ch_HwProcessor the ch hw processor

+	 * @param indexSupertask the index supertask

+	 * @param capacity the capacity

+	 */

+	private void createSupertaskInfo(CH_HwProcessor ch_HwProcessor, int indexSupertask, Float capacity) {

+		SupertaskInfo si = new SupertaskInfo(ch_HwProcessor.getBase_InstanceSpecification(), "SuperTask_" + indexSupertask, capacity);

+		supertaskInfoList.add(si);

+		System.out.println("--*************** BRANCH ***************");

+		System.out.println("Scheduling_Server (");

+		System.out.println("	Type				=> Regular,");

+		System.out.println("	Name				=> SuperTask_" + indexSupertask + ",");

+		System.out.println("	Server_Sched_parameters		=> ( Type => RUN_Supertask,");

+		System.out.println("					     Utilization => " + capacity + " ),"); // FIXME:

+		// utilization

+		// is

+		// not

+		// expressed

+		// as U

+		// in

+		// Geoffrey's

+		// example

+		System.out.println("	Scheduler			=> Scheduler_1 );");

+		System.out.println();

+		System.out.println("Scheduler (");

+		System.out.println("	Type	=> Secondary_Scheduler,");

+		System.out.println("	Name	=> SecondaryScheduler_" + indexSupertask + ",");

+		System.out.println("	Policy	=> ( 	Type	=> EDF,");

+		System.out.println("			Worst_Context_Switch	=> 20 ),");// FIXME: based on

+		// Compagnin paper

+		// at ECRTS2014

+		System.out.println("	Server	=> SuperTask_" + indexSupertask + " );");

+		System.out.println();

+	}

+

+	/**

+	 * Builds the associations.

+	 *

+	 * @param firstPack the first pack

+	 */

+	public void buildAssociations(Map<Bin, List<Task>> firstPack) {

+		// add chtasks which represent real tasks to the core map and add the

+		// related operation chain to the same core

+		// TODO solve the following problem: the related operations may be shared

+		// between tasks which can be assigned to different cores!

+

+		core2chtask = new HashMap<CHCore, LinkedHashSet<Object>>();

+		int coreIndex = 0;

+		for (Bin core : firstPack.keySet()) {

+			assignedOperations = new HashSet<CHTask>();

+			LinkedHashSet<Object> list = new LinkedHashSet<Object>();

+			for (Task task : firstPack.get(core)) {

+				CHTask owningTask = getCHRTFromTask(task);

+				list.add(owningTask);

+				addRelatedOperations(owningTask, list);

+			}

+			core2chtask.put(cores.get(coreIndex++), list);

+		}

+	}

+

+	// the related operations of a task are assigned to the same core of the task,

+	// TODO for now every operation shared by multiple tasks is assigned to the

+	/**

+	 * Adds the related operations.

+	 *

+	 * @param owningTask the owning task

+	 * @param list the list

+	 */

+	// same core of the first task that was processed

+	private void addRelatedOperations(CHTask owningTask, LinkedHashSet<Object> list) {

+		for (CHTask operation : operationList.get(owningTask)) {

+			if (!assignedOperations.contains(operation)) {

+				list.add(operation);

+				assignedOperations.add(operation);

+			}

+		}

+	}

+

+	/**

+	 * Gets the task ID.

+	 *

+	 * @param chRtSpecification the ch rt specification

+	 * @return the task ID

+	 */

+	private String getTaskID(CHRtSpecification chRtSpecification) {

+		return chRtSpecification.getContext().getName() + UMLUtils.getElementID(chRtSpecification.getContext());

+	}

+

+	/**

+	 * Gets the CHRT from task.

+	 *

+	 * @param task the task

+	 * @return the CHRT from task

+	 */

+	private CHTask getCHRTFromTask(Task task) {

+		for (CHTask chtask : operationList.keySet()) {

+			if (getTaskID(chtask.getCHRtSpecification()).equals(task.getId()))

+				return chtask;

+		}

+		return null;

+	}

+

+	/**

+	 * Prints the content.

+	 */

+	private void printContent() {

+		System.out.println("Tasks:");

+		for (CHTask chtask : operationList.keySet()) {

+			System.out.println(chtask);

+		}

+	}

+

+	/**

+	 * Update model.

+	 */

+	protected void updateModel() {

+		boolean b1 = core2chtask != null && !core2chtask.isEmpty();

+		boolean b2 = core2supertask != null && !core2supertask.isEmpty();

+

+		if (b1 || b2) {

+

+			TransactionalEditingDomain editingDomain = TransactionUtil.getEditingDomain(umlModel);

+			editingDomain.getCommandStack().execute(new Com(editingDomain));

+		}

+	}

+

+	/**

+	 * Query content.

+	 *

+	 * @param owner the owner

+	 * @throws ModelError the model error

+	 */

+	protected void queryContent(Model owner) throws ModelError {

+		EList<CH_HwProcessor> x = QueryUtils.getAllProcessorInstances(umlModel);

+		x = QueryUtils.filterMultiCoreProcessors(x);

+		if (x.size() > 1)

+			throw new ModelError("Assignment generation works only on single processor systems");

+

+		// Look for Packages stereotyped as CHGAResourcePlatform in the Deployment

+		// View

+		EList<Package> packages = QueryUtils.getResourcePlatformPackages(umlModel, CHESSProfileManager.DEPLOYMENT_VIEW);

+

+		if (packages.size() == 0) {

+			ModelError me = new ModelError("Error in model: no Package stereotyped as CHGAResourcePlatform in the Deployment View!");

+			throw me;

+		}

+		hwSystemsList = new BasicEList<InstanceSpecification>();

+

+		for (Package pack : packages) {

+			EList<InstanceSpecification> processors = new BasicEList<InstanceSpecification>();

+			for (CH_HwProcessor ch_processor : QueryUtils.getAllProcessorInstancesInPackage(pack)) {

+				InstanceSpecification instSpec = ch_processor.getBase_InstanceSpecification();

+				processors.add(instSpec);

+				EList<CHCore> theCores = QueryUtils.getCores(ch_processor);

+				coresMap.put(instSpec, theCores);

+				cores.addAll(theCores);

+			}

+			InstanceSpecification theSystem = UMLUtils.getRootInstanceInPackage(pack);

+			hwSystemsList.add(theSystem);

+			processorsMap.put(pack, processors);

+		}

+

+		if (hwSystemsList.isEmpty()) {

+			ModelError me = new ModelError("Error in model: no System in the Deployment View!");

+			throw me;

+		}

+

+		EList<InstanceSpecification> instances = UMLUtils.getAllComponentInstances(umlModel, true);

+		EList<CHTask> chtasks = QueryUtils.getCHTasksList(instances);

+

+		operationList = QueryUtils.getOperationChain(umlModel, chtasks);

+

+	}

+

+	/**

+	 * The Class Com.

+	 */

+	class Com extends RecordingCommand {

+

+		/**

+		 * Instantiates a new com.

+		 *

+		 * @param domain the domain

+		 */

+		public Com(TransactionalEditingDomain domain) {

+			super(domain);

+		}

+

+		/* (non-Javadoc)

+		 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()

+		 */

+		@Override

+		protected void doExecute() {

+			try {

+				QueryUtils.deleteTask2CoreAssociations(hwSystem);

+				if (!useRUN)

+					GeneratorUtils.buildTask2CoreAssociations(hwSystem, core2chtask);

+				else

+					GeneratorUtils.buildTask2SuperTaskAssociations(hwSystem, core2supertask, supertaskInfoList);

+

+			} catch (Exception e) {

+				throw new OperationCanceledException(e.getMessage());

+			}

+		}

+	}

+

+}

diff --git a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/commands/GenerateTask2CoreAssignmentsUsingRUNCommand.java b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/commands/GenerateTask2CoreAssignmentsUsingRUNCommand.java
index bd2cc5f..9d244a5 100644
--- a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/commands/GenerateTask2CoreAssignmentsUsingRUNCommand.java
+++ b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/commands/GenerateTask2CoreAssignmentsUsingRUNCommand.java
@@ -1,36 +1,43 @@
-/*------------------------------------------------------------------------------
-  -
-  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 
-  - 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:
-  -
-  - Alessandro Zovi azovi@math.unipd.it
-  - Stefano Puri stefano.puri@intecs.it
-  - Laura Baracchi laura.baracchi@intecs.it
-  - Nicholas Pacini nicholas.pacini@intecs.it  
-  -
-  - Initial API and implementation and/or initial documentation
-  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.commands;
-
-import org.polarsys.chess.core.util.uml.ModelError;
-
-
-/**
- * The Class GenerateTask2CoreAssignmentsUsingRUNCommand.
- */
-public class GenerateTask2CoreAssignmentsUsingRUNCommand extends GenerateTask2CoreAssignmentsCommand {
-	
-	/* (non-Javadoc)
-	 * @see org.polarsys.chess.multicore.commands.GenerateTask2CoreAssignmentsCommand#execute()
-	 */
-	@Override
-	public void execute() throws ModelError {
-		queryContent(umlModel);
-		executeTask2CoreCalculator(true);
-		updateModel();
-	}
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+/*------------------------------------------------------------------------------

+  -

+  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 

+  - All rights reserved. This program and the accompanying materials

+  - are made available under the terms of the Eclipse Public License v2.0

+  - which accompanies this distribution, and is available at

+  - http://www.eclipse.org/legal/epl-v20.html

+  -

+  - Contributors:

+  -

+  - Alessandro Zovi azovi@math.unipd.it

+  - Stefano Puri stefano.puri@intecs.it

+  - Laura Baracchi laura.baracchi@intecs.it

+  - Nicholas Pacini nicholas.pacini@intecs.it  

+  -

+  - Initial API and implementation and/or initial documentation

+  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.commands;

+

+import org.polarsys.chess.core.util.uml.ModelError;

+

+

+/**

+ * The Class GenerateTask2CoreAssignmentsUsingRUNCommand.

+ */

+public class GenerateTask2CoreAssignmentsUsingRUNCommand extends GenerateTask2CoreAssignmentsCommand {

+	

+	/* (non-Javadoc)

+	 * @see org.polarsys.chess.multicore.commands.GenerateTask2CoreAssignmentsCommand#execute()

+	 */

+	@Override

+	public void execute() throws ModelError {

+		queryContent(umlModel);

+		executeTask2CoreCalculator(true);

+		updateModel();

+	}

+}

diff --git a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/commands/package.html b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/commands/package.html
index 7d7d546..ffa6b93 100644
--- a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/commands/package.html
+++ b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/commands/package.html
@@ -1,7 +1,14 @@
+#-------------------------------------------------------------------------------

+# Copyright (C) 2020 

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v2.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v20.html

+#-------------------------------------------------------------------------------

 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

 <html>

 <head></head>

 <body>

   Provides...

 </body>

-</html>
\ No newline at end of file
+</html>

diff --git a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/dialogs/CoreSelectorDialog.java b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/dialogs/CoreSelectorDialog.java
index 2f1f4c7..b374255 100644
--- a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/dialogs/CoreSelectorDialog.java
+++ b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/dialogs/CoreSelectorDialog.java
@@ -1,602 +1,609 @@
-/*------------------------------------------------------------------------------
-  -
-  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 
-  - 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:
-  -
-  - Alessandro Zovi azovi@math.unipd.it
-  - Stefano Puri stefano.puri@intecs.it
-  - Laura Baracchi laura.baracchi@intecs.it
-  - Nicholas Pacini nicholas.pacini@intecs.it  
-  -
-  - Initial API and implementation and/or initial documentation
-  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.dialogs;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jface.dialogs.TrayDialog;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Assign;
-import org.eclipse.papyrus.infra.widgets.Activator;
-import org.eclipse.papyrus.infra.widgets.editors.IElementSelectionListener;
-import org.eclipse.papyrus.infra.widgets.messages.Messages;
-import org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider;
-import org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.layout.RowData;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.polarsys.chess.multicore.model.CHCore;
-import org.polarsys.chess.multicore.utils.QueryUtils;
-
-/**
- * The Class CoreSelectorDialog.
- */
-public class CoreSelectorDialog extends TrayDialog implements
-		SelectionListener, ISelectionChangedListener, IDoubleClickListener, IElementSelectionListener {
-
-	/** The Constant PARTITIONS_TO_CORES. */
-	public static final int PARTITIONS_TO_CORES = 0;
-	
-	/** The Constant COMPONENTS_TO_CORES. */
-	public static final int COMPONENTS_TO_CORES = 1;
-	
-	/** The Constant TASKS_TO_CORES. */
-	public static final int TASKS_TO_CORES = 2;
-	
-	/** The cores. */
-	private EList<CHCore> cores;
-	
-	/** The map. */
-	Map<CHCore,  LinkedHashSet<Object>> map;
-	
-	/** The selector section. */
-	private Composite selectorSection;
-	
-	/** The buttons section. */
-	private Composite buttonsSection;
-	
-	/** The add. */
-	private Button add;
-	
-	/** The remove. */
-	private Button remove;
-	
-	/** The add all. */
-	private Button addAll;
-	
-	/** The remove all. */
-	private Button removeAll;
-	
-	/** The selected elements. */
-	private Tree selectedElements;
-	
-	/** The label provider. */
-	//private TreeViewer selectedElementsViewer;
-	private ILabelProvider labelProvider;
-	//@Deprecated
-	//protected final Collection<Object> allElements;
-	/** The selector. */
-	//private TreeViewer treeViewer;
-	private ReferenceSelector selector;
-	
-	/** The partition selected. */
-	private CHCore partitionSelected;
-	
-	/** The selected elements viewers. */
-	private HashMap<CHCore, TreeViewer> selectedElementsViewers;
-	
-	/** The result. */
-	private Map<CHCore, LinkedHashSet<Object>> result;
-
-	/**
-	 * Open core selector dialog for Assign partition to cores or assign components to cores or assign tasks to cores.
-	 *
-	 * @param parentShell the parent shell
-	 * @param referenceSelector the reference selector
-	 * @param cores the cores
-	 * @param pack the pack
-	 * @param assignments the assignments
-	 * @param mode PARTITIONS_TO_CORES | COMPONENTS_TO_CORES | TASKS_TO_CORES
-	 * @param title the title
-	 */
-	public CoreSelectorDialog(Shell parentShell,
-			ReferenceSelector referenceSelector,
-			EList<CHCore> cores, org.eclipse.uml2.uml.Package pack, EList<Assign> assignments, int mode, String title) {
-		// super(parentShell, selector, title, unique, ordered, upperBound);
-		super(parentShell);
-		this.cores = cores;
-		this.selector = referenceSelector;
-		map = new HashMap<CHCore,  LinkedHashSet<Object>>();
-		if(mode==PARTITIONS_TO_CORES) {
-			for (CHCore core : cores) {
-				// LB 20150708 look at assignments that already exist in the model before opening the selector
-				LinkedHashSet<Object> theCoresPartitions = QueryUtils.getPartitionsAssigned2Core(core, assignments);
-				map.put(core, theCoresPartitions);
-				//map.put(core, new LinkedHashSet<Object>());
-			}
-		}
-		if(mode==COMPONENTS_TO_CORES) {
-			for (CHCore core : cores) {
-				// LB 20150708 look at assignments that already exist in the model before opening the selector
-				LinkedHashSet<Object> theCoresComponents = QueryUtils.getComponentsAssigned2Core(core, assignments);
-				map.put(core, theCoresComponents);
-			}
-		}
-		if(mode==TASKS_TO_CORES) {
-			for (CHCore core : cores) {
-				// LB 20150708 look at assignments that already exist in the model before opening the selector
-				LinkedHashSet<Object> theCoresTasks = QueryUtils.getTasksAssigned2Core(core, pack, assignments);
-				map.put(core, theCoresTasks);
-			}
-		}
-		//this.allElements = new LinkedHashSet<Object>();
-		
-		selector.addElementSelectionListener(this);
-		
-		selectedElementsViewers = new HashMap<CHCore, TreeViewer>();
-		setTitle(title);
-	}
-
-	/**
-	 * Gets the display.
-	 *
-	 * @return the display
-	 */
-	public static Display getDisplay() {
-		Display display = Display.getCurrent();
-		// may be null if outside the UI thread
-		if (display == null)
-			display = Display.getDefault();
-		return display;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
-	@Override
-	protected Control createDialogArea(Composite parent) {
-		GridLayout layout = (GridLayout) parent.getLayout();
-		layout.numColumns = 2;
-		layout.makeColumnsEqualWidth = true;
-		
-		
-
-		Composite selectorPane = new Composite(parent, SWT.NONE);
-		selectorPane.setLayout(new GridLayout(1, false));
-		selectorPane
-				.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
-		final ScrolledComposite sc2 = new ScrolledComposite(parent,
-				SWT.V_SCROLL | SWT.BORDER);
-		sc2.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		sc2.setExpandHorizontal(true);
-		sc2.setExpandVertical(true);
-
-		final Composite selectedPane = new Composite(sc2, SWT.NONE);
-		selectedPane.setLayout(new GridLayout(1,false));
-		selectedPane
-				.setLayoutData(new GridData(SWT.RIGHT, SWT.FILL, true, true));
-		for (CHCore object : cores) {
-			Composite selectedPane_ = new Composite(selectedPane, SWT.NONE);
-			selectedPane_.setLayout(new GridLayout(2, false));
-			selectedPane_.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
-			createListSection(object, selectedPane_);
-		}
-		
-		sc2.setContent(selectedPane);
-		sc2.setMinSize(sc2.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-		
-
-		sc2.addControlListener(new ControlAdapter() {
-			@Override
-			public void controlResized(ControlEvent e) {
-				sc2.setMinSize(sc2.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-			}
-		});
-
-		createSelectorSection(selectorPane);
-		
-
-		return super.createDialogArea(parent);
-	}
-
-	/**
-	 * Creates the selector section.
-	 *
-	 * @param parent the parent
-	 */
-	private void createSelectorSection(Composite parent) {
-		selectorSection = new Composite(parent, SWT.NONE);
-		selectorSection.setLayout(new FillLayout());
-		selectorSection.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true,
-				true));
-		
-		selector.createControls(selectorSection);
-		//selector.setSelectedElements(allElements.toArray());
-
-		
-	}
-
-	/**
-	 * Creates the controls section.
-	 *
-	 * @param partition the partition
-	 * @param parent the parent
-	 */
-	private void createControlsSection(CHCore partition,
-			Composite parent) {
-		buttonsSection = new Composite(parent, SWT.NONE);
-		buttonsSection.setLayout(new GridLayout(1, true));
-
-		add = new Button(buttonsSection, SWT.PUSH);
-		add.setImage(Activator.getDefault().getImage("/icons/arrow_right.gif")); //$NON-NLS-1$
-		add.addSelectionListener(this);
-		add.setToolTipText(Messages.MultipleValueSelectorDialog_AddSelectedElements);
-		add.setData(new WidgetData(WidgetData.ADD, partition));
-
-		remove = new Button(buttonsSection, SWT.PUSH);
-		remove.setImage(Activator.getDefault()
-				.getImage("/icons/arrow_left.gif")); //$NON-NLS-1$
-		remove.addSelectionListener(this);
-		remove.setToolTipText(Messages.MultipleValueEditor_RemoveSelectedElements);
-		remove.setData(new WidgetData(WidgetData.REMOVE, partition));
-
-		addAll = new Button(buttonsSection, SWT.PUSH);
-		addAll.setImage(Activator.getDefault().getImage(
-				"/icons/arrow_double.gif")); //$NON-NLS-1$
-		addAll.addSelectionListener(this);
-		addAll.setToolTipText(Messages.MultipleValueSelectorDialog_AddAllElements);
-		addAll.setData(new WidgetData(WidgetData.AALL, partition));
-
-		removeAll = new Button(buttonsSection, SWT.PUSH);
-		removeAll.setImage(Activator.getDefault().getImage(
-				"/icons/arrow_left_double.gif")); //$NON-NLS-1$
-		removeAll.addSelectionListener(this);
-		removeAll
-				.setToolTipText(Messages.MultipleValueSelectorDialog_RemoveAllElements);
-		removeAll.setData(new WidgetData(WidgetData.RALL, partition));
-	}
-
-	/**
-	 * Gets the instance specification name.
-	 *
-	 * @param instanceSpecification the instance specification
-	 * @return the instance specification name
-	 */
-	private String getInstanceSpecificationName(
-			CHCore instanceSpecification) {
-		
-		return instanceSpecification.toString();
-	}
-
-	/**
-	 * Creates the list section.
-	 *
-	 * @param core the core
-	 * @param parent the parent
-	 */
-	private void createListSection(CHCore core,
-			Composite parent) {
-		
-		Label lbl = new Label(parent, SWT.NONE);
-		lbl.setText(getInstanceSpecificationName(core));
-
-		GridData lLbl = new GridData(SWT.CENTER, SWT.TOP, true, true, 2, 1);
-		// gd_lblNewLabel.horizontalIndent = 1;
-		lbl.setLayoutData(lLbl);
-		
-		createControlsSection(core, parent);
-
-		selectedElements = new Tree(parent, SWT.MULTI | SWT.BORDER
-				| SWT.V_SCROLL | SWT.H_SCROLL);
-		// selectedElements.addSelectionListener(this);
-		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
-		selectedElements.setLayoutData(data);
-		
-		
-		TreeViewer selectedElementsViewer = new TreeViewer(selectedElements);
-
-		selectedElementsViewer.addSelectionChangedListener(this);
-		selectedElementsViewer.addDoubleClickListener(this);
-
-		selectedElementsViewer
-				.setContentProvider(CollectionContentProvider.instance);
-
-		if (labelProvider != null) {
-			selectedElementsViewer.setLabelProvider(labelProvider);
-		}
-		
-		selectedElementsViewer.setInput(map.get(core));
-		
-		selectedElementsViewers.put(core, selectedElementsViewer);
-
-		
-		//selector.setSelectedElements(allElements.toArray());
-
-	}
-
-	/**
-	 * The Class WidgetData.
-	 */
-	class WidgetData {
-		
-		/** The type. */
-		int type;
-		
-		/** The partition. */
-		CHCore partition;
-		
-		/** The Constant AALL. */
-		final static int ADD = 1, REMOVE = 2, RALL = 3, AALL = 4;
-
-		/**
-		 * Instantiates a new widget data.
-		 *
-		 * @param type the type
-		 * @param partition the partition
-		 */
-		public WidgetData(int type, CHCore partition) {
-			this.partition = partition;
-			this.type = type;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-	 */
-	@Override
-	public void widgetSelected(SelectionEvent e) {
-		Object data = e.widget.getData();
-		if (data != null && data instanceof WidgetData) {
-			WidgetData wData = (WidgetData) data;
-			if (wData.type == WidgetData.ADD) {
-				addAction(wData.partition);
-			} else if (wData.type == WidgetData.REMOVE) {
-				removeAction(wData.partition);
-			} else if (wData.type == WidgetData.AALL) {
-				addAllAction(wData.partition);
-			} else if (wData.type == WidgetData.RALL) {
-				removeAllAction(wData.partition);
-			}
-		}
-	}
-
-	
-
-	/**
-	 * Removes the all action.
-	 *
-	 * @param partition the partition
-	 */
-	private void removeAllAction(CHCore partition) {
-		TreeViewer selectedElementsViewer = selectedElementsViewers.get(partition);
-		
-		LinkedHashSet<Object> el = new LinkedHashSet<Object>();
-		for (LinkedHashSet<Object> values : map.values()) {
-			el.addAll(values);
-		}
-
-		
-		
-		LinkedHashSet<Object> el1 = map.get(partition);			
-		
-		for(Object element : el1.toArray()) {
-			el.remove(element);
-			el1.remove(element);
-		}
-		
-		selector.setSelectedElements(el.toArray());
-		selectedElementsViewer.setSelection(null);
-		selectedElementsViewer.refresh();
-	}
-
-	/**
-	 * Adds the all action.
-	 *
-	 * @param partition the partition
-	 */
-	private void addAllAction(CHCore partition) {
-		Object[] elements = selector.getAllElements();
-		partitionSelected = partition;
-		addElements(elements);
-	}
-
-	/**
-	 * Removes the action.
-	 *
-	 * @param partition the partition
-	 */
-	private void removeAction(CHCore partition) {
-		TreeViewer selectedElementsViewer = selectedElementsViewers.get(partition);
-		
-		LinkedHashSet<Object> el = new LinkedHashSet<Object>();
-		for (LinkedHashSet<Object> values : map.values()) {
-			el.addAll(values);
-		}
-
-		IStructuredSelection selection = (IStructuredSelection)selectedElementsViewer.getSelection();
-		if(selection.isEmpty()) {
-			return;
-		}
-		
-		LinkedHashSet<Object> el1 = map.get(partition);			
-		
-		for(Object element : selection.toArray()) {
-			el.remove(element);
-			el1.remove(element);
-		}
-		
-		selector.setSelectedElements(el.toArray());
-		selectedElementsViewer.setSelection(null);
-		selectedElementsViewer.refresh();
-	}
-
-	/**
-	 * Adds the action.
-	 *
-	 * @param partition the partition
-	 */
-	private void addAction(CHCore partition) {
-		Object[] elements = selector.getSelectedElements();
-		partitionSelected = partition;
-		addElements(elements);
-	}
-	
-	/**
-	 * Gets the selected elements.
-	 *
-	 * @return the selected elements
-	 */
-	private InstanceSpecification[] getSelectedElements() {
-		return null;
-		/*ISelection selection = treeViewer.getSelection();
-
-		if(selection instanceof IStructuredSelection) {
-			Object[] containerElementsToMove = getElementsToMove(((IStructuredSelection)selection).toArray());
-			Object[] semanticElementsToMove = getSemanticElements(containerElementsToMove);
-			addSelectedElements(semanticElementsToMove);
-			return semanticElementsToMove;
-		}
-
-		return new Object[0];*/
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
-	 */
-	@Override
-	public void widgetDefaultSelected(SelectionEvent e) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)
-	 */
-	@Override
-	public void doubleClick(DoubleClickEvent event) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-	 */
-	@Override
-	public void selectionChanged(SelectionChangedEvent event) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/**
-	 * Sets the label provider.
-	 *
-	 * @param serv the new label provider
-	 */
-	public void setLabelProvider(ILabelProvider serv) {
-		labelProvider = serv;
-	}
-
-	/**
-	 * Sets the message.
-	 *
-	 * @param string the new message
-	 */
-	public void setMessage(String string) {
-		// TODO Auto-generated method stub
-	}
-
-	/**
-	 * Sets the title.
-	 *
-	 * @param string the new title
-	 */
-	public void setTitle(String string) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.papyrus.infra.widgets.editors.IElementSelectionListener#addElements(java.lang.Object[])
-	 */
-	@Override
-	public void addElements(Object[] elements) {
-		if(elements != null && partitionSelected != null) {
-			
-			
-			Collection<InstanceSpecification> t = new ArrayList<InstanceSpecification>();
-			LinkedHashSet<Object> l = map.get(partitionSelected);
-			
-			l.addAll(Arrays.asList(elements));
-			
-			TreeViewer selectedElementsViewer = selectedElementsViewers.get(partitionSelected);
-			selectedElementsViewer.refresh();
-			
-		}		
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-	 */
-	@Override
-	protected void okPressed() {
-		setResult(map);
-
-		super.okPressed();
-	}
-
-	
-	/**
-	 * Sets the result.
-	 *
-	 * @param map_ the map
-	 */
-	protected void setResult(Map<CHCore, LinkedHashSet<Object>> map_) {
-		result = map_;
-	}
-
-	
-	/**
-	 * Gets the result.
-	 *
-	 * @return the result
-	 */
-	public Map<CHCore, LinkedHashSet<Object>> getResult() {
-		return result;
-	}
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+/*------------------------------------------------------------------------------

+  -

+  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 

+  - All rights reserved. This program and the accompanying materials

+  - are made available under the terms of the Eclipse Public License v2.0

+  - which accompanies this distribution, and is available at

+  - http://www.eclipse.org/legal/epl-v20.html

+  -

+  - Contributors:

+  -

+  - Alessandro Zovi azovi@math.unipd.it

+  - Stefano Puri stefano.puri@intecs.it

+  - Laura Baracchi laura.baracchi@intecs.it

+  - Nicholas Pacini nicholas.pacini@intecs.it  

+  -

+  - Initial API and implementation and/or initial documentation

+  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.dialogs;

+

+import java.util.ArrayList;

+import java.util.Arrays;

+import java.util.Collection;

+import java.util.HashMap;

+import java.util.LinkedHashSet;

+import java.util.Map;

+

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.jface.dialogs.TrayDialog;

+import org.eclipse.jface.viewers.DoubleClickEvent;

+import org.eclipse.jface.viewers.IDoubleClickListener;

+import org.eclipse.jface.viewers.ILabelProvider;

+import org.eclipse.jface.viewers.ISelectionChangedListener;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.jface.viewers.SelectionChangedEvent;

+import org.eclipse.jface.viewers.TreeViewer;

+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Assign;

+import org.eclipse.papyrus.infra.widgets.Activator;

+import org.eclipse.papyrus.infra.widgets.editors.IElementSelectionListener;

+import org.eclipse.papyrus.infra.widgets.messages.Messages;

+import org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider;

+import org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.custom.ScrolledComposite;

+import org.eclipse.swt.events.ControlAdapter;

+import org.eclipse.swt.events.ControlEvent;

+import org.eclipse.swt.events.SelectionEvent;

+import org.eclipse.swt.events.SelectionListener;

+import org.eclipse.swt.layout.FillLayout;

+import org.eclipse.swt.layout.GridData;

+import org.eclipse.swt.layout.GridLayout;

+import org.eclipse.swt.layout.RowData;

+import org.eclipse.swt.layout.RowLayout;

+import org.eclipse.swt.widgets.Button;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Control;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.swt.widgets.Label;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.swt.widgets.Tree;

+import org.eclipse.uml2.uml.InstanceSpecification;

+import org.polarsys.chess.multicore.model.CHCore;

+import org.polarsys.chess.multicore.utils.QueryUtils;

+

+/**

+ * The Class CoreSelectorDialog.

+ */

+public class CoreSelectorDialog extends TrayDialog implements

+		SelectionListener, ISelectionChangedListener, IDoubleClickListener, IElementSelectionListener {

+

+	/** The Constant PARTITIONS_TO_CORES. */

+	public static final int PARTITIONS_TO_CORES = 0;

+	

+	/** The Constant COMPONENTS_TO_CORES. */

+	public static final int COMPONENTS_TO_CORES = 1;

+	

+	/** The Constant TASKS_TO_CORES. */

+	public static final int TASKS_TO_CORES = 2;

+	

+	/** The cores. */

+	private EList<CHCore> cores;

+	

+	/** The map. */

+	Map<CHCore,  LinkedHashSet<Object>> map;

+	

+	/** The selector section. */

+	private Composite selectorSection;

+	

+	/** The buttons section. */

+	private Composite buttonsSection;

+	

+	/** The add. */

+	private Button add;

+	

+	/** The remove. */

+	private Button remove;

+	

+	/** The add all. */

+	private Button addAll;

+	

+	/** The remove all. */

+	private Button removeAll;

+	

+	/** The selected elements. */

+	private Tree selectedElements;

+	

+	/** The label provider. */

+	//private TreeViewer selectedElementsViewer;

+	private ILabelProvider labelProvider;

+	//@Deprecated

+	//protected final Collection<Object> allElements;

+	/** The selector. */

+	//private TreeViewer treeViewer;

+	private ReferenceSelector selector;

+	

+	/** The partition selected. */

+	private CHCore partitionSelected;

+	

+	/** The selected elements viewers. */

+	private HashMap<CHCore, TreeViewer> selectedElementsViewers;

+	

+	/** The result. */

+	private Map<CHCore, LinkedHashSet<Object>> result;

+

+	/**

+	 * Open core selector dialog for Assign partition to cores or assign components to cores or assign tasks to cores.

+	 *

+	 * @param parentShell the parent shell

+	 * @param referenceSelector the reference selector

+	 * @param cores the cores

+	 * @param pack the pack

+	 * @param assignments the assignments

+	 * @param mode PARTITIONS_TO_CORES | COMPONENTS_TO_CORES | TASKS_TO_CORES

+	 * @param title the title

+	 */

+	public CoreSelectorDialog(Shell parentShell,

+			ReferenceSelector referenceSelector,

+			EList<CHCore> cores, org.eclipse.uml2.uml.Package pack, EList<Assign> assignments, int mode, String title) {

+		// super(parentShell, selector, title, unique, ordered, upperBound);

+		super(parentShell);

+		this.cores = cores;

+		this.selector = referenceSelector;

+		map = new HashMap<CHCore,  LinkedHashSet<Object>>();

+		if(mode==PARTITIONS_TO_CORES) {

+			for (CHCore core : cores) {

+				// LB 20150708 look at assignments that already exist in the model before opening the selector

+				LinkedHashSet<Object> theCoresPartitions = QueryUtils.getPartitionsAssigned2Core(core, assignments);

+				map.put(core, theCoresPartitions);

+				//map.put(core, new LinkedHashSet<Object>());

+			}

+		}

+		if(mode==COMPONENTS_TO_CORES) {

+			for (CHCore core : cores) {

+				// LB 20150708 look at assignments that already exist in the model before opening the selector

+				LinkedHashSet<Object> theCoresComponents = QueryUtils.getComponentsAssigned2Core(core, assignments);

+				map.put(core, theCoresComponents);

+			}

+		}

+		if(mode==TASKS_TO_CORES) {

+			for (CHCore core : cores) {

+				// LB 20150708 look at assignments that already exist in the model before opening the selector

+				LinkedHashSet<Object> theCoresTasks = QueryUtils.getTasksAssigned2Core(core, pack, assignments);

+				map.put(core, theCoresTasks);

+			}

+		}

+		//this.allElements = new LinkedHashSet<Object>();

+		

+		selector.addElementSelectionListener(this);

+		

+		selectedElementsViewers = new HashMap<CHCore, TreeViewer>();

+		setTitle(title);

+	}

+

+	/**

+	 * Gets the display.

+	 *

+	 * @return the display

+	 */

+	public static Display getDisplay() {

+		Display display = Display.getCurrent();

+		// may be null if outside the UI thread

+		if (display == null)

+			display = Display.getDefault();

+		return display;

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)

+	 */

+	@Override

+	protected Control createDialogArea(Composite parent) {

+		GridLayout layout = (GridLayout) parent.getLayout();

+		layout.numColumns = 2;

+		layout.makeColumnsEqualWidth = true;

+		

+		

+

+		Composite selectorPane = new Composite(parent, SWT.NONE);

+		selectorPane.setLayout(new GridLayout(1, false));

+		selectorPane

+				.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

+

+		final ScrolledComposite sc2 = new ScrolledComposite(parent,

+				SWT.V_SCROLL | SWT.BORDER);

+		sc2.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

+		sc2.setExpandHorizontal(true);

+		sc2.setExpandVertical(true);

+

+		final Composite selectedPane = new Composite(sc2, SWT.NONE);

+		selectedPane.setLayout(new GridLayout(1,false));

+		selectedPane

+				.setLayoutData(new GridData(SWT.RIGHT, SWT.FILL, true, true));

+		for (CHCore object : cores) {

+			Composite selectedPane_ = new Composite(selectedPane, SWT.NONE);

+			selectedPane_.setLayout(new GridLayout(2, false));

+			selectedPane_.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

+

+			createListSection(object, selectedPane_);

+		}

+		

+		sc2.setContent(selectedPane);

+		sc2.setMinSize(sc2.computeSize(SWT.DEFAULT, SWT.DEFAULT));

+		

+

+		sc2.addControlListener(new ControlAdapter() {

+			@Override

+			public void controlResized(ControlEvent e) {

+				sc2.setMinSize(sc2.computeSize(SWT.DEFAULT, SWT.DEFAULT));

+			}

+		});

+

+		createSelectorSection(selectorPane);

+		

+

+		return super.createDialogArea(parent);

+	}

+

+	/**

+	 * Creates the selector section.

+	 *

+	 * @param parent the parent

+	 */

+	private void createSelectorSection(Composite parent) {

+		selectorSection = new Composite(parent, SWT.NONE);

+		selectorSection.setLayout(new FillLayout());

+		selectorSection.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true,

+				true));

+		

+		selector.createControls(selectorSection);

+		//selector.setSelectedElements(allElements.toArray());

+

+		

+	}

+

+	/**

+	 * Creates the controls section.

+	 *

+	 * @param partition the partition

+	 * @param parent the parent

+	 */

+	private void createControlsSection(CHCore partition,

+			Composite parent) {

+		buttonsSection = new Composite(parent, SWT.NONE);

+		buttonsSection.setLayout(new GridLayout(1, true));

+

+		add = new Button(buttonsSection, SWT.PUSH);

+		add.setImage(Activator.getDefault().getImage("/icons/arrow_right.gif")); //$NON-NLS-1$

+		add.addSelectionListener(this);

+		add.setToolTipText(Messages.MultipleValueSelectorDialog_AddSelectedElements);

+		add.setData(new WidgetData(WidgetData.ADD, partition));

+

+		remove = new Button(buttonsSection, SWT.PUSH);

+		remove.setImage(Activator.getDefault()

+				.getImage("/icons/arrow_left.gif")); //$NON-NLS-1$

+		remove.addSelectionListener(this);

+		remove.setToolTipText(Messages.MultipleValueEditor_RemoveSelectedElements);

+		remove.setData(new WidgetData(WidgetData.REMOVE, partition));

+

+		addAll = new Button(buttonsSection, SWT.PUSH);

+		addAll.setImage(Activator.getDefault().getImage(

+				"/icons/arrow_double.gif")); //$NON-NLS-1$

+		addAll.addSelectionListener(this);

+		addAll.setToolTipText(Messages.MultipleValueSelectorDialog_AddAllElements);

+		addAll.setData(new WidgetData(WidgetData.AALL, partition));

+

+		removeAll = new Button(buttonsSection, SWT.PUSH);

+		removeAll.setImage(Activator.getDefault().getImage(

+				"/icons/arrow_left_double.gif")); //$NON-NLS-1$

+		removeAll.addSelectionListener(this);

+		removeAll

+				.setToolTipText(Messages.MultipleValueSelectorDialog_RemoveAllElements);

+		removeAll.setData(new WidgetData(WidgetData.RALL, partition));

+	}

+

+	/**

+	 * Gets the instance specification name.

+	 *

+	 * @param instanceSpecification the instance specification

+	 * @return the instance specification name

+	 */

+	private String getInstanceSpecificationName(

+			CHCore instanceSpecification) {

+		

+		return instanceSpecification.toString();

+	}

+

+	/**

+	 * Creates the list section.

+	 *

+	 * @param core the core

+	 * @param parent the parent

+	 */

+	private void createListSection(CHCore core,

+			Composite parent) {

+		

+		Label lbl = new Label(parent, SWT.NONE);

+		lbl.setText(getInstanceSpecificationName(core));

+

+		GridData lLbl = new GridData(SWT.CENTER, SWT.TOP, true, true, 2, 1);

+		// gd_lblNewLabel.horizontalIndent = 1;

+		lbl.setLayoutData(lLbl);

+		

+		createControlsSection(core, parent);

+

+		selectedElements = new Tree(parent, SWT.MULTI | SWT.BORDER

+				| SWT.V_SCROLL | SWT.H_SCROLL);

+		// selectedElements.addSelectionListener(this);

+		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);

+		selectedElements.setLayoutData(data);

+		

+		

+		TreeViewer selectedElementsViewer = new TreeViewer(selectedElements);

+

+		selectedElementsViewer.addSelectionChangedListener(this);

+		selectedElementsViewer.addDoubleClickListener(this);

+

+		selectedElementsViewer

+				.setContentProvider(CollectionContentProvider.instance);

+

+		if (labelProvider != null) {

+			selectedElementsViewer.setLabelProvider(labelProvider);

+		}

+		

+		selectedElementsViewer.setInput(map.get(core));

+		

+		selectedElementsViewers.put(core, selectedElementsViewer);

+

+		

+		//selector.setSelectedElements(allElements.toArray());

+

+	}

+

+	/**

+	 * The Class WidgetData.

+	 */

+	class WidgetData {

+		

+		/** The type. */

+		int type;

+		

+		/** The partition. */

+		CHCore partition;

+		

+		/** The Constant AALL. */

+		final static int ADD = 1, REMOVE = 2, RALL = 3, AALL = 4;

+

+		/**

+		 * Instantiates a new widget data.

+		 *

+		 * @param type the type

+		 * @param partition the partition

+		 */

+		public WidgetData(int type, CHCore partition) {

+			this.partition = partition;

+			this.type = type;

+		}

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)

+	 */

+	@Override

+	public void widgetSelected(SelectionEvent e) {

+		Object data = e.widget.getData();

+		if (data != null && data instanceof WidgetData) {

+			WidgetData wData = (WidgetData) data;

+			if (wData.type == WidgetData.ADD) {

+				addAction(wData.partition);

+			} else if (wData.type == WidgetData.REMOVE) {

+				removeAction(wData.partition);

+			} else if (wData.type == WidgetData.AALL) {

+				addAllAction(wData.partition);

+			} else if (wData.type == WidgetData.RALL) {

+				removeAllAction(wData.partition);

+			}

+		}

+	}

+

+	

+

+	/**

+	 * Removes the all action.

+	 *

+	 * @param partition the partition

+	 */

+	private void removeAllAction(CHCore partition) {

+		TreeViewer selectedElementsViewer = selectedElementsViewers.get(partition);

+		

+		LinkedHashSet<Object> el = new LinkedHashSet<Object>();

+		for (LinkedHashSet<Object> values : map.values()) {

+			el.addAll(values);

+		}

+

+		

+		

+		LinkedHashSet<Object> el1 = map.get(partition);			

+		

+		for(Object element : el1.toArray()) {

+			el.remove(element);

+			el1.remove(element);

+		}

+		

+		selector.setSelectedElements(el.toArray());

+		selectedElementsViewer.setSelection(null);

+		selectedElementsViewer.refresh();

+	}

+

+	/**

+	 * Adds the all action.

+	 *

+	 * @param partition the partition

+	 */

+	private void addAllAction(CHCore partition) {

+		Object[] elements = selector.getAllElements();

+		partitionSelected = partition;

+		addElements(elements);

+	}

+

+	/**

+	 * Removes the action.

+	 *

+	 * @param partition the partition

+	 */

+	private void removeAction(CHCore partition) {

+		TreeViewer selectedElementsViewer = selectedElementsViewers.get(partition);

+		

+		LinkedHashSet<Object> el = new LinkedHashSet<Object>();

+		for (LinkedHashSet<Object> values : map.values()) {

+			el.addAll(values);

+		}

+

+		IStructuredSelection selection = (IStructuredSelection)selectedElementsViewer.getSelection();

+		if(selection.isEmpty()) {

+			return;

+		}

+		

+		LinkedHashSet<Object> el1 = map.get(partition);			

+		

+		for(Object element : selection.toArray()) {

+			el.remove(element);

+			el1.remove(element);

+		}

+		

+		selector.setSelectedElements(el.toArray());

+		selectedElementsViewer.setSelection(null);

+		selectedElementsViewer.refresh();

+	}

+

+	/**

+	 * Adds the action.

+	 *

+	 * @param partition the partition

+	 */

+	private void addAction(CHCore partition) {

+		Object[] elements = selector.getSelectedElements();

+		partitionSelected = partition;

+		addElements(elements);

+	}

+	

+	/**

+	 * Gets the selected elements.

+	 *

+	 * @return the selected elements

+	 */

+	private InstanceSpecification[] getSelectedElements() {

+		return null;

+		/*ISelection selection = treeViewer.getSelection();

+

+		if(selection instanceof IStructuredSelection) {

+			Object[] containerElementsToMove = getElementsToMove(((IStructuredSelection)selection).toArray());

+			Object[] semanticElementsToMove = getSemanticElements(containerElementsToMove);

+			addSelectedElements(semanticElementsToMove);

+			return semanticElementsToMove;

+		}

+

+		return new Object[0];*/

+	}

+

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)

+	 */

+	@Override

+	public void widgetDefaultSelected(SelectionEvent e) {

+		// TODO Auto-generated method stub

+

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)

+	 */

+	@Override

+	public void doubleClick(DoubleClickEvent event) {

+		// TODO Auto-generated method stub

+

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)

+	 */

+	@Override

+	public void selectionChanged(SelectionChangedEvent event) {

+		// TODO Auto-generated method stub

+

+	}

+

+	/**

+	 * Sets the label provider.

+	 *

+	 * @param serv the new label provider

+	 */

+	public void setLabelProvider(ILabelProvider serv) {

+		labelProvider = serv;

+	}

+

+	/**

+	 * Sets the message.

+	 *

+	 * @param string the new message

+	 */

+	public void setMessage(String string) {

+		// TODO Auto-generated method stub

+	}

+

+	/**

+	 * Sets the title.

+	 *

+	 * @param string the new title

+	 */

+	public void setTitle(String string) {

+		// TODO Auto-generated method stub

+

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.papyrus.infra.widgets.editors.IElementSelectionListener#addElements(java.lang.Object[])

+	 */

+	@Override

+	public void addElements(Object[] elements) {

+		if(elements != null && partitionSelected != null) {

+			

+			

+			Collection<InstanceSpecification> t = new ArrayList<InstanceSpecification>();

+			LinkedHashSet<Object> l = map.get(partitionSelected);

+			

+			l.addAll(Arrays.asList(elements));

+			

+			TreeViewer selectedElementsViewer = selectedElementsViewers.get(partitionSelected);

+			selectedElementsViewer.refresh();

+			

+		}		

+	}

+	

+	

+	/* (non-Javadoc)

+	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()

+	 */

+	@Override

+	protected void okPressed() {

+		setResult(map);

+

+		super.okPressed();

+	}

+

+	

+	/**

+	 * Sets the result.

+	 *

+	 * @param map_ the map

+	 */

+	protected void setResult(Map<CHCore, LinkedHashSet<Object>> map_) {

+		result = map_;

+	}

+

+	

+	/**

+	 * Gets the result.

+	 *

+	 * @return the result

+	 */

+	public Map<CHCore, LinkedHashSet<Object>> getResult() {

+		return result;

+	}

+}

diff --git a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/dialogs/SystemSelectionDialog.java b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/dialogs/SystemSelectionDialog.java
index 9333179..5761ac4 100644
--- a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/dialogs/SystemSelectionDialog.java
+++ b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/dialogs/SystemSelectionDialog.java
@@ -1,154 +1,161 @@
-/*------------------------------------------------------------------------------
-  -
-  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 
-  - 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:
-  -
-  - Alessandro Zovi azovi@math.unipd.it
-  - Stefano Puri stefano.puri@intecs.it
-  - Laura Baracchi laura.baracchi@intecs.it
-  - Nicholas Pacini nicholas.pacini@intecs.it  
-  -
-  - Initial API and implementation and/or initial documentation
-  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.dialogs;
-
-import java.util.List;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.SWT;
-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.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.uml2.uml.Package;
-
-/**
- * The Class SystemSelectionDialog.
- */
-public class SystemSelectionDialog extends Dialog {
-
-	/** The choose system field. */
-	private Combo chooseSystemField;
-	
-	/** The selected system name. */
-	private String selectedSystemName;
-	
-	/** The selected system. */
-	private InstanceSpecification selectedSystem;
-	
-	/** The title. */
-	private String title;
-	
-	/** The systems list. */
-	private List<InstanceSpecification> systemsList;
-	
-	/**
-	 * Instantiates a new system selection dialog.
-	 *
-	 * @param parentShell the parent shell
-	 * @param systemSelection the system selection
-	 * @param title the title
-	 */
-	public SystemSelectionDialog(Shell parentShell, List<InstanceSpecification> systemSelection, String title) {
-		super(parentShell);
-		systemsList = systemSelection;
-		this.title = title;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
-	@Override
-	protected Control createDialogArea(Composite parent) {
-		GridLayout layout = new GridLayout(1, false);
-
-		layout.horizontalSpacing = 4;
-		layout.verticalSpacing = 4;
-		layout.marginBottom = 5;
-		layout.marginTop = 5;
-	
-		parent.setLayout(layout);
-		new Label(parent, SWT.NONE).setText("Systems found in model: ");
-		
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		chooseSystemField = new Combo(parent, SWT.DROP_DOWN | SWT.READ_ONLY);
-		for(InstanceSpecification theSystem : systemsList){
-			chooseSystemField.add(theSystem.getQualifiedName());
-		}
-		chooseSystemField.setLayoutData(gridData);
-		
-		new Label(parent, SWT.NONE).setText("");
-		
-		return parent;	
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
-	 */
-	@Override
-	protected void configureShell(Shell shell) {
-		super.configureShell(shell);
-		shell.setText(title);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#isResizable()
-	 */
-	@Override
-	protected boolean isResizable() {
-		return true;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-	 */
-	@Override
-	protected void okPressed() {
-		setSystemName(chooseSystemField.getText());		
-		super.okPressed();
-	}
-	
-	/**
-	 * Sets the system name.
-	 *
-	 * @param qname the new system name
-	 */
-	public void setSystemName(String qname) {
-		this.selectedSystemName = qname;
-	}
-
-	/**
-	 * Gets the system name.
-	 *
-	 * @return the system name
-	 */
-	public String getSystemName() {
-		return selectedSystemName;
-	}
-
-	/**
-	 * Gets the selected system.
-	 *
-	 * @return the selected system
-	 */
-	public InstanceSpecification getSelectedSystem() {
-		return selectedSystem;
-	}
-
-	/**
-	 * Sets the selected system.
-	 *
-	 * @param selectedSystem the new selected system
-	 */
-	public void setSelectedSystem(InstanceSpecification selectedSystem) {
-		this.selectedSystem = selectedSystem;
-	}
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+/*------------------------------------------------------------------------------

+  -

+  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 

+  - All rights reserved. This program and the accompanying materials

+  - are made available under the terms of the Eclipse Public License v2.0

+  - which accompanies this distribution, and is available at

+  - http://www.eclipse.org/legal/epl-v20.html

+  -

+  - Contributors:

+  -

+  - Alessandro Zovi azovi@math.unipd.it

+  - Stefano Puri stefano.puri@intecs.it

+  - Laura Baracchi laura.baracchi@intecs.it

+  - Nicholas Pacini nicholas.pacini@intecs.it  

+  -

+  - Initial API and implementation and/or initial documentation

+  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.dialogs;

+

+import java.util.List;

+

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.swt.SWT;

+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.Control;

+import org.eclipse.swt.widgets.Label;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.uml2.uml.InstanceSpecification;

+import org.eclipse.uml2.uml.Package;

+

+/**

+ * The Class SystemSelectionDialog.

+ */

+public class SystemSelectionDialog extends Dialog {

+

+	/** The choose system field. */

+	private Combo chooseSystemField;

+	

+	/** The selected system name. */

+	private String selectedSystemName;

+	

+	/** The selected system. */

+	private InstanceSpecification selectedSystem;

+	

+	/** The title. */

+	private String title;

+	

+	/** The systems list. */

+	private List<InstanceSpecification> systemsList;

+	

+	/**

+	 * Instantiates a new system selection dialog.

+	 *

+	 * @param parentShell the parent shell

+	 * @param systemSelection the system selection

+	 * @param title the title

+	 */

+	public SystemSelectionDialog(Shell parentShell, List<InstanceSpecification> systemSelection, String title) {

+		super(parentShell);

+		systemsList = systemSelection;

+		this.title = title;

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)

+	 */

+	@Override

+	protected Control createDialogArea(Composite parent) {

+		GridLayout layout = new GridLayout(1, false);

+

+		layout.horizontalSpacing = 4;

+		layout.verticalSpacing = 4;

+		layout.marginBottom = 5;

+		layout.marginTop = 5;

+	

+		parent.setLayout(layout);

+		new Label(parent, SWT.NONE).setText("Systems found in model: ");

+		

+		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);

+		chooseSystemField = new Combo(parent, SWT.DROP_DOWN | SWT.READ_ONLY);

+		for(InstanceSpecification theSystem : systemsList){

+			chooseSystemField.add(theSystem.getQualifiedName());

+		}

+		chooseSystemField.setLayoutData(gridData);

+		

+		new Label(parent, SWT.NONE).setText("");

+		

+		return parent;	

+	}

+	

+	/* (non-Javadoc)

+	 * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)

+	 */

+	@Override

+	protected void configureShell(Shell shell) {

+		super.configureShell(shell);

+		shell.setText(title);

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.jface.dialogs.Dialog#isResizable()

+	 */

+	@Override

+	protected boolean isResizable() {

+		return true;

+	}

+	

+	/* (non-Javadoc)

+	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()

+	 */

+	@Override

+	protected void okPressed() {

+		setSystemName(chooseSystemField.getText());		

+		super.okPressed();

+	}

+	

+	/**

+	 * Sets the system name.

+	 *

+	 * @param qname the new system name

+	 */

+	public void setSystemName(String qname) {

+		this.selectedSystemName = qname;

+	}

+

+	/**

+	 * Gets the system name.

+	 *

+	 * @return the system name

+	 */

+	public String getSystemName() {

+		return selectedSystemName;

+	}

+

+	/**

+	 * Gets the selected system.

+	 *

+	 * @return the selected system

+	 */

+	public InstanceSpecification getSelectedSystem() {

+		return selectedSystem;

+	}

+

+	/**

+	 * Sets the selected system.

+	 *

+	 * @param selectedSystem the new selected system

+	 */

+	public void setSelectedSystem(InstanceSpecification selectedSystem) {

+		this.selectedSystem = selectedSystem;

+	}

+}

diff --git a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/dialogs/package.html b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/dialogs/package.html
index 7d7d546..ffa6b93 100644
--- a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/dialogs/package.html
+++ b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/dialogs/package.html
@@ -1,7 +1,14 @@
+#-------------------------------------------------------------------------------

+# Copyright (C) 2020 

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v2.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v20.html

+#-------------------------------------------------------------------------------

 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

 <html>

 <head></head>

 <body>

   Provides...

 </body>

-</html>
\ No newline at end of file
+</html>

diff --git a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/model/AbstractCommand.java b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/model/AbstractCommand.java
index 58d2c2e..20a7dae 100644
--- a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/model/AbstractCommand.java
+++ b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/model/AbstractCommand.java
@@ -1,92 +1,99 @@
-/*------------------------------------------------------------------------------
-  -
-  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 
-  - 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:
-  -
-  - Alessandro Zovi azovi@math.unipd.it
-  - Stefano Puri stefano.puri@intecs.it
-  - Laura Baracchi laura.baracchi@intecs.it
-  - Nicholas Pacini nicholas.pacini@intecs.it  
-  -
-  - Initial API and implementation and/or initial documentation
-  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.model;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.papyrus.editor.PapyrusMultiDiagramEditor;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.uml2.uml.Model;
-import org.polarsys.chess.core.notifications.ResourceNotification;
-import org.polarsys.chess.core.util.uml.ModelError;
-import org.polarsys.chess.core.util.uml.ResourceUtils;
-import org.polarsys.chess.core.views.DiagramStatus;
-import org.polarsys.chess.service.gui.utils.CHESSEditorUtils;
-
-/**
- * The Class AbstractCommand.
- */
-public abstract class AbstractCommand extends AbstractHandler {
-	
-	/** The uml model. */
-	protected Model umlModel;
-	
-	/** The event. */
-	protected ExecutionEvent event;
-	
-	/** The diagram status. */
-	protected DiagramStatus diagramStatus;
-	
-	/** The editor. */
-	protected PapyrusMultiDiagramEditor editor;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
-	 */
-	@Override
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		this.event = event;
-
-		editor = CHESSEditorUtils.getCHESSEditor();
-		diagramStatus = CHESSEditorUtils.getDiagramStatus(editor);
-		if (editor == null || diagramStatus == null)
-			return null;
-		try {
-			Resource res = ResourceUtils.getUMLResource(editor
-					.getServicesRegistry());
-			umlModel = ResourceUtils.getModel(res);
-			if (umlModel != null) {
-				
-				try {
-					execute();
-				} catch (ModelError e) {
-					ResourceNotification.showInfo("Problems with the model. " + e.getCause() + ": " + e.getMessage());
-				} catch (Exception e) {
-					e.printStackTrace();
-					ResourceNotification.showError("Unexpected error: " + e.toString());
-				}
-				
-				
-				
-			}
-		} catch (ServiceException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	/**
-	 * Execute.
-	 *
-	 * @throws ModelError the model error
-	 * @throws Exception the exception
-	 */
-	public abstract void execute() throws ModelError, Exception;
-
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+/*------------------------------------------------------------------------------

+  -

+  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 

+  - All rights reserved. This program and the accompanying materials

+  - are made available under the terms of the Eclipse Public License v2.0

+  - which accompanies this distribution, and is available at

+  - http://www.eclipse.org/legal/epl-v20.html

+  -

+  - Contributors:

+  -

+  - Alessandro Zovi azovi@math.unipd.it

+  - Stefano Puri stefano.puri@intecs.it

+  - Laura Baracchi laura.baracchi@intecs.it

+  - Nicholas Pacini nicholas.pacini@intecs.it  

+  -

+  - Initial API and implementation and/or initial documentation

+  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.model;

+

+import org.eclipse.core.commands.AbstractHandler;

+import org.eclipse.core.commands.ExecutionEvent;

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.papyrus.editor.PapyrusMultiDiagramEditor;

+import org.eclipse.papyrus.infra.core.services.ServiceException;

+import org.eclipse.uml2.uml.Model;

+import org.polarsys.chess.core.notifications.ResourceNotification;

+import org.polarsys.chess.core.util.uml.ModelError;

+import org.polarsys.chess.core.util.uml.ResourceUtils;

+import org.polarsys.chess.core.views.DiagramStatus;

+import org.polarsys.chess.service.gui.utils.CHESSEditorUtils;

+

+/**

+ * The Class AbstractCommand.

+ */

+public abstract class AbstractCommand extends AbstractHandler {

+	

+	/** The uml model. */

+	protected Model umlModel;

+	

+	/** The event. */

+	protected ExecutionEvent event;

+	

+	/** The diagram status. */

+	protected DiagramStatus diagramStatus;

+	

+	/** The editor. */

+	protected PapyrusMultiDiagramEditor editor;

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)

+	 */

+	@Override

+	public Object execute(ExecutionEvent event) throws ExecutionException {

+		this.event = event;

+

+		editor = CHESSEditorUtils.getCHESSEditor();

+		diagramStatus = CHESSEditorUtils.getDiagramStatus(editor);

+		if (editor == null || diagramStatus == null)

+			return null;

+		try {

+			Resource res = ResourceUtils.getUMLResource(editor

+					.getServicesRegistry());

+			umlModel = ResourceUtils.getModel(res);

+			if (umlModel != null) {

+				

+				try {

+					execute();

+				} catch (ModelError e) {

+					ResourceNotification.showInfo("Problems with the model. " + e.getCause() + ": " + e.getMessage());

+				} catch (Exception e) {

+					e.printStackTrace();

+					ResourceNotification.showError("Unexpected error: " + e.toString());

+				}

+				

+				

+				

+			}

+		} catch (ServiceException e) {

+			e.printStackTrace();

+		}

+		return null;

+	}

+

+	/**

+	 * Execute.

+	 *

+	 * @throws ModelError the model error

+	 * @throws Exception the exception

+	 */

+	public abstract void execute() throws ModelError, Exception;

+

+}

diff --git a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/model/CHCore.java b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/model/CHCore.java
index 4a69ffa..d61c507 100644
--- a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/model/CHCore.java
+++ b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/model/CHCore.java
@@ -1,125 +1,132 @@
-/*------------------------------------------------------------------------------
-  -
-  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 
-  - 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:
-  -
-  - Alessandro Zovi azovi@math.unipd.it
-  - Stefano Puri stefano.puri@intecs.it
-  - Laura Baracchi laura.baracchi@intecs.it
-  - Nicholas Pacini nicholas.pacini@intecs.it  
-  -
-  - Initial API and implementation and/or initial documentation
-  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.model;
-
-import java.util.Arrays;
-
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.polarsys.chess.chessmlprofile.Predictability.DeploymentConfiguration.HardwareBaseline.CH_HwProcessor;
-
-
-/**
- * The Class CHCore.
- *
- * @author Alessandro Zovi
- * 
- * CHCore represents the tuple <processor, core>.
- */
-public final class CHCore {
-
-	/** The processor. */
-	private CH_HwProcessor processor;
-	
-	/** The name. */
-	private String name;
-
-	/**
-	 * Instantiates a new CH core.
-	 *
-	 * @param processor the processor
-	 * @param coreName the core name
-	 */
-	public CHCore(CH_HwProcessor processor, String coreName) {
-		
-		if (processor.getBase_InstanceSpecification() == null)
-			throw new RuntimeException("Core can be instanced only by an InstanceSpecification!");
-		
-		this.processor = processor;
-		this.name = coreName;
-	}
-
-	
-	/**
-	 * Gets the processor.
-	 *
-	 * @return the processor
-	 */
-	public CH_HwProcessor getProcessor() {
-		return processor;
-	}
-	
-	/**
-	 * Gets the name.
-	 *
-	 * @return the name
-	 */
-	public String getName() {
-		return name;
-	}
-	
-	/**
-	 * Gets the qualified name.
-	 *
-	 * @return the qualified name
-	 */
-	public String getQualifiedName() {
-		
-		StringBuilder sb = new StringBuilder();
-		return sb.append(processor.getBase_InstanceSpecification().getName()).append('_').append(name).toString();
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object obj) {
-		if(!(obj instanceof CHCore)) return false;
-		if(obj == this) return true;
-		
-		CHCore that = (CHCore) obj;
-		return processor.getBase_InstanceSpecification().getName().equals(that.processor.getBase_InstanceSpecification().getName()) && name.equals(that.name);
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return getQualifiedName();
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	@Override
-	public int hashCode() {
-		 return Arrays.hashCode(new Object[] {
-				 processor.getBase_InstanceSpecification().getName().hashCode(),
-		         name.hashCode(),
-		    });
-	}
-
-
-	/**
-	 * Gets the processor instance.
-	 *
-	 * @return the processor instance
-	 */
-	public InstanceSpecification getProcessorInstance() {
-		return processor.getBase_InstanceSpecification();
-	}
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+/*------------------------------------------------------------------------------

+  -

+  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 

+  - All rights reserved. This program and the accompanying materials

+  - are made available under the terms of the Eclipse Public License v2.0

+  - which accompanies this distribution, and is available at

+  - http://www.eclipse.org/legal/epl-v20.html

+  -

+  - Contributors:

+  -

+  - Alessandro Zovi azovi@math.unipd.it

+  - Stefano Puri stefano.puri@intecs.it

+  - Laura Baracchi laura.baracchi@intecs.it

+  - Nicholas Pacini nicholas.pacini@intecs.it  

+  -

+  - Initial API and implementation and/or initial documentation

+  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.model;

+

+import java.util.Arrays;

+

+import org.eclipse.uml2.uml.InstanceSpecification;

+import org.polarsys.chess.chessmlprofile.Predictability.DeploymentConfiguration.HardwareBaseline.CH_HwProcessor;

+

+

+/**

+ * The Class CHCore.

+ *

+ * @author Alessandro Zovi

+ * 

+ * CHCore represents the tuple <processor, core>.

+ */

+public final class CHCore {

+

+	/** The processor. */

+	private CH_HwProcessor processor;

+	

+	/** The name. */

+	private String name;

+

+	/**

+	 * Instantiates a new CH core.

+	 *

+	 * @param processor the processor

+	 * @param coreName the core name

+	 */

+	public CHCore(CH_HwProcessor processor, String coreName) {

+		

+		if (processor.getBase_InstanceSpecification() == null)

+			throw new RuntimeException("Core can be instanced only by an InstanceSpecification!");

+		

+		this.processor = processor;

+		this.name = coreName;

+	}

+

+	

+	/**

+	 * Gets the processor.

+	 *

+	 * @return the processor

+	 */

+	public CH_HwProcessor getProcessor() {

+		return processor;

+	}

+	

+	/**

+	 * Gets the name.

+	 *

+	 * @return the name

+	 */

+	public String getName() {

+		return name;

+	}

+	

+	/**

+	 * Gets the qualified name.

+	 *

+	 * @return the qualified name

+	 */

+	public String getQualifiedName() {

+		

+		StringBuilder sb = new StringBuilder();

+		return sb.append(processor.getBase_InstanceSpecification().getName()).append('_').append(name).toString();

+	}

+	

+	/* (non-Javadoc)

+	 * @see java.lang.Object#equals(java.lang.Object)

+	 */

+	@Override

+	public boolean equals(Object obj) {

+		if(!(obj instanceof CHCore)) return false;

+		if(obj == this) return true;

+		

+		CHCore that = (CHCore) obj;

+		return processor.getBase_InstanceSpecification().getName().equals(that.processor.getBase_InstanceSpecification().getName()) && name.equals(that.name);

+	}

+	

+	/* (non-Javadoc)

+	 * @see java.lang.Object#toString()

+	 */

+	@Override

+	public String toString() {

+		return getQualifiedName();

+	}

+	

+	/* (non-Javadoc)

+	 * @see java.lang.Object#hashCode()

+	 */

+	@Override

+	public int hashCode() {

+		 return Arrays.hashCode(new Object[] {

+				 processor.getBase_InstanceSpecification().getName().hashCode(),

+		         name.hashCode(),

+		    });

+	}

+

+

+	/**

+	 * Gets the processor instance.

+	 *

+	 * @return the processor instance

+	 */

+	public InstanceSpecification getProcessorInstance() {

+		return processor.getBase_InstanceSpecification();

+	}

+}

diff --git a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/model/CHTask.java b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/model/CHTask.java
index bfe2a86..cc5d0f7 100644
--- a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/model/CHTask.java
+++ b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/model/CHTask.java
@@ -1,149 +1,156 @@
-/*------------------------------------------------------------------------------
-  -
-  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 
-  - 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:
-  -
-  - Alessandro Zovi azovi@math.unipd.it
-  - Stefano Puri stefano.puri@intecs.it
-  - Laura Baracchi laura.baracchi@intecs.it
-  - Nicholas Pacini nicholas.pacini@intecs.it  
-  -
-  - Initial API and implementation and/or initial documentation
-  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.model;
-
-import java.util.Arrays;
-
-import org.eclipse.uml2.uml.BehavioralFeature;
-import org.eclipse.uml2.uml.Parameter;
-import org.polarsys.chess.chessmlprofile.Predictability.RTComponentModel.CHRtPortSlot;
-import org.polarsys.chess.chessmlprofile.Predictability.RTComponentModel.CHRtSpecification;
-import org.polarsys.chess.multicore.utils.QueryUtils;
-
-
-/**
- * The Class CHTask.
- *
- * @author Alessandro Zovi
- * 
- * CHTask represents the instance of a component operation.
- * The operation can also be seen as a task, a shared resource or a simple procedure call.
- */
-
-public final class CHTask {
-	
-	/** The slot. */
-	private CHRtPortSlot slot;
-	
-	/** The spec. */
-	private CHRtSpecification spec;
-
-	/**
-	 * Instantiates a new CH task.
-	 *
-	 * @param slot the slot
-	 * @param spec the spec
-	 */
-	public CHTask(CHRtPortSlot slot, CHRtSpecification spec) {
-		this.slot = slot;
-		this.spec = spec;
-	}
-	
-	/**
-	 * Gets the slot.
-	 *
-	 * @return the slot
-	 */
-	public CHRtPortSlot getSlot() {
-		return slot;
-	}
-	
-	/**
-	 * Gets the CH rt specification.
-	 *
-	 * @return the CH rt specification
-	 */
-	public CHRtSpecification getCHRtSpecification() {
-		return spec;
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		//TODO it should take into consideration the multiplicity of the instances in Inst_full package
-		return slot.getBase_Slot().getOwningInstance().getName() + "_" 
-				+ slot.getBase_Slot().getDefiningFeature().getName() 
-				+ "_" + spec.getContext().getName() + "(" +getType()+")";
-	}
-	
-	/**
-	 * Gets the name.
-	 *
-	 * @return the name
-	 */
-	public String getName() {
-		//TODO it should take into consideration the multiplicity of the instances in Inst_full package
-		return slot.getBase_Slot().getOwningInstance().getName() + "_" 
-				+ slot.getBase_Slot().getDefiningFeature().getName() 
-				+ "_" + getOpName(spec.getContext())+"_task";
-	}
-	
-	/**
-	 * Gets the op name.
-	 *
-	 * @param op the op
-	 * @return the op name
-	 */
-	private String getOpName(BehavioralFeature op){
-		StringBuilder sb = new StringBuilder(op.getName());
-		for (Parameter par : op.getOwnedParameters()) {
-			sb.append('_').append(par.getType().getName());
-		}
-		return sb.toString();
-	}
-	
-	/**
-	 * Gets the type.
-	 *
-	 * @return the type
-	 */
-	public String getType(){
-		String type = "simple_operation";
-		if(QueryUtils.isOccKindSporadicOrPeriodic(spec.getOccKind())){
-			type = "task";
-		} else if (QueryUtils.isGuarded(spec)){
-			type = "shared_resource";
-		}
-		return type;
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object obj) {
-		if(!(obj instanceof CHTask)) return false;
-		if(obj == this) return true;
-		
-		CHTask that = (CHTask) obj;
-		return toString().equals(that.toString());
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	@Override
-	public int hashCode() {
-		 return Arrays.hashCode(new Object[] {
-				 slot.getBase_Slot().getOwningInstance().getName(),
-				 slot.getBase_Slot().getDefiningFeature().getName(),
-				 spec.getContext().getName()
-		    });
-	}
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+/*------------------------------------------------------------------------------

+  -

+  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 

+  - All rights reserved. This program and the accompanying materials

+  - are made available under the terms of the Eclipse Public License v2.0

+  - which accompanies this distribution, and is available at

+  - http://www.eclipse.org/legal/epl-v20.html

+  -

+  - Contributors:

+  -

+  - Alessandro Zovi azovi@math.unipd.it

+  - Stefano Puri stefano.puri@intecs.it

+  - Laura Baracchi laura.baracchi@intecs.it

+  - Nicholas Pacini nicholas.pacini@intecs.it  

+  -

+  - Initial API and implementation and/or initial documentation

+  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.model;

+

+import java.util.Arrays;

+

+import org.eclipse.uml2.uml.BehavioralFeature;

+import org.eclipse.uml2.uml.Parameter;

+import org.polarsys.chess.chessmlprofile.Predictability.RTComponentModel.CHRtPortSlot;

+import org.polarsys.chess.chessmlprofile.Predictability.RTComponentModel.CHRtSpecification;

+import org.polarsys.chess.multicore.utils.QueryUtils;

+

+

+/**

+ * The Class CHTask.

+ *

+ * @author Alessandro Zovi

+ * 

+ * CHTask represents the instance of a component operation.

+ * The operation can also be seen as a task, a shared resource or a simple procedure call.

+ */

+

+public final class CHTask {

+	

+	/** The slot. */

+	private CHRtPortSlot slot;

+	

+	/** The spec. */

+	private CHRtSpecification spec;

+

+	/**

+	 * Instantiates a new CH task.

+	 *

+	 * @param slot the slot

+	 * @param spec the spec

+	 */

+	public CHTask(CHRtPortSlot slot, CHRtSpecification spec) {

+		this.slot = slot;

+		this.spec = spec;

+	}

+	

+	/**

+	 * Gets the slot.

+	 *

+	 * @return the slot

+	 */

+	public CHRtPortSlot getSlot() {

+		return slot;

+	}

+	

+	/**

+	 * Gets the CH rt specification.

+	 *

+	 * @return the CH rt specification

+	 */

+	public CHRtSpecification getCHRtSpecification() {

+		return spec;

+	}

+	

+	/* (non-Javadoc)

+	 * @see java.lang.Object#toString()

+	 */

+	@Override

+	public String toString() {

+		//TODO it should take into consideration the multiplicity of the instances in Inst_full package

+		return slot.getBase_Slot().getOwningInstance().getName() + "_" 

+				+ slot.getBase_Slot().getDefiningFeature().getName() 

+				+ "_" + spec.getContext().getName() + "(" +getType()+")";

+	}

+	

+	/**

+	 * Gets the name.

+	 *

+	 * @return the name

+	 */

+	public String getName() {

+		//TODO it should take into consideration the multiplicity of the instances in Inst_full package

+		return slot.getBase_Slot().getOwningInstance().getName() + "_" 

+				+ slot.getBase_Slot().getDefiningFeature().getName() 

+				+ "_" + getOpName(spec.getContext())+"_task";

+	}

+	

+	/**

+	 * Gets the op name.

+	 *

+	 * @param op the op

+	 * @return the op name

+	 */

+	private String getOpName(BehavioralFeature op){

+		StringBuilder sb = new StringBuilder(op.getName());

+		for (Parameter par : op.getOwnedParameters()) {

+			sb.append('_').append(par.getType().getName());

+		}

+		return sb.toString();

+	}

+	

+	/**

+	 * Gets the type.

+	 *

+	 * @return the type

+	 */

+	public String getType(){

+		String type = "simple_operation";

+		if(QueryUtils.isOccKindSporadicOrPeriodic(spec.getOccKind())){

+			type = "task";

+		} else if (QueryUtils.isGuarded(spec)){

+			type = "shared_resource";

+		}

+		return type;

+	}

+	

+	/* (non-Javadoc)

+	 * @see java.lang.Object#equals(java.lang.Object)

+	 */

+	@Override

+	public boolean equals(Object obj) {

+		if(!(obj instanceof CHTask)) return false;

+		if(obj == this) return true;

+		

+		CHTask that = (CHTask) obj;

+		return toString().equals(that.toString());

+	}

+	

+	/* (non-Javadoc)

+	 * @see java.lang.Object#hashCode()

+	 */

+	@Override

+	public int hashCode() {

+		 return Arrays.hashCode(new Object[] {

+				 slot.getBase_Slot().getOwningInstance().getName(),

+				 slot.getBase_Slot().getDefiningFeature().getName(),

+				 spec.getContext().getName()

+		    });

+	}

+}

diff --git a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/model/SupertaskInfo.java b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/model/SupertaskInfo.java
index 4742aa9..7672f42 100644
--- a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/model/SupertaskInfo.java
+++ b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/model/SupertaskInfo.java
@@ -1,104 +1,111 @@
-/*------------------------------------------------------------------------------
-  -
-  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 
-  - 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:
-  -
-  - Alessandro Zovi azovi@math.unipd.it
-  - Stefano Puri stefano.puri@intecs.it
-  - Laura Baracchi laura.baracchi@intecs.it
-  - Nicholas Pacini nicholas.pacini@intecs.it  
-  -
-  - Initial API and implementation and/or initial documentation
-  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.model;
-
-import org.eclipse.uml2.uml.InstanceSpecification;
-
-/**
- * The Class SupertaskInfo.
- */
-public class SupertaskInfo {
-
-	/** The name. */
-	private String name;
-	
-	/** The capacity. */
-	private int capacity;
-	
-	/** The processor instance. */
-	private InstanceSpecification processorInstance;
-
-	/**
-	 * Instantiates a new supertask info.
-	 *
-	 * @param processorInstance the processor instance
-	 * @param name the name
-	 * @param capacity the capacity
-	 */
-	public SupertaskInfo(InstanceSpecification processorInstance, String name, float capacity) {
-		super();
-		this.setName(name);
-		this.setCapacity(capacity);
-		this.setProcessorInstance(processorInstance);
-	}
-
-	/**
-	 * Gets the capacity.
-	 *
-	 * @return the capacity
-	 */
-	public float getCapacity() {
-		return capacity;
-	}
-
-	/**
-	 * Convert capacity from a float to a int value representing the percentage of
-	 * utilization of the processor.
-	 *
-	 * @param capacity the new capacity
-	 */
-	public void setCapacity(float capacity) {
-		this.capacity = Math.round(capacity*100);
-	}
-
-	/**
-	 * Gets the name.
-	 *
-	 * @return the name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Sets the name.
-	 *
-	 * @param name the new name
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * Gets the processor instance.
-	 *
-	 * @return the processor instance
-	 */
-	public InstanceSpecification getProcessorInstance() {
-		return processorInstance;
-	}
-
-	/**
-	 * Sets the processor instance.
-	 *
-	 * @param processorInstance the new processor instance
-	 */
-	public void setProcessorInstance(InstanceSpecification processorInstance) {
-		this.processorInstance = processorInstance;
-	}
-
-}
\ No newline at end of file
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+/*------------------------------------------------------------------------------

+  -

+  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 

+  - All rights reserved. This program and the accompanying materials

+  - are made available under the terms of the Eclipse Public License v2.0

+  - which accompanies this distribution, and is available at

+  - http://www.eclipse.org/legal/epl-v20.html

+  -

+  - Contributors:

+  -

+  - Alessandro Zovi azovi@math.unipd.it

+  - Stefano Puri stefano.puri@intecs.it

+  - Laura Baracchi laura.baracchi@intecs.it

+  - Nicholas Pacini nicholas.pacini@intecs.it  

+  -

+  - Initial API and implementation and/or initial documentation

+  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.model;

+

+import org.eclipse.uml2.uml.InstanceSpecification;

+

+/**

+ * The Class SupertaskInfo.

+ */

+public class SupertaskInfo {

+

+	/** The name. */

+	private String name;

+	

+	/** The capacity. */

+	private int capacity;

+	

+	/** The processor instance. */

+	private InstanceSpecification processorInstance;

+

+	/**

+	 * Instantiates a new supertask info.

+	 *

+	 * @param processorInstance the processor instance

+	 * @param name the name

+	 * @param capacity the capacity

+	 */

+	public SupertaskInfo(InstanceSpecification processorInstance, String name, float capacity) {

+		super();

+		this.setName(name);

+		this.setCapacity(capacity);

+		this.setProcessorInstance(processorInstance);

+	}

+

+	/**

+	 * Gets the capacity.

+	 *

+	 * @return the capacity

+	 */

+	public float getCapacity() {

+		return capacity;

+	}

+

+	/**

+	 * Convert capacity from a float to a int value representing the percentage of

+	 * utilization of the processor.

+	 *

+	 * @param capacity the new capacity

+	 */

+	public void setCapacity(float capacity) {

+		this.capacity = Math.round(capacity*100);

+	}

+

+	/**

+	 * Gets the name.

+	 *

+	 * @return the name

+	 */

+	public String getName() {

+		return name;

+	}

+

+	/**

+	 * Sets the name.

+	 *

+	 * @param name the new name

+	 */

+	public void setName(String name) {

+		this.name = name;

+	}

+

+	/**

+	 * Gets the processor instance.

+	 *

+	 * @return the processor instance

+	 */

+	public InstanceSpecification getProcessorInstance() {

+		return processorInstance;

+	}

+

+	/**

+	 * Sets the processor instance.

+	 *

+	 * @param processorInstance the new processor instance

+	 */

+	public void setProcessorInstance(InstanceSpecification processorInstance) {

+		this.processorInstance = processorInstance;

+	}

+

+}

diff --git a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/model/package.html b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/model/package.html
index 7d7d546..ffa6b93 100644
--- a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/model/package.html
+++ b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/model/package.html
@@ -1,7 +1,14 @@
+#-------------------------------------------------------------------------------

+# Copyright (C) 2020 

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v2.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v20.html

+#-------------------------------------------------------------------------------

 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

 <html>

 <head></head>

 <body>

   Provides...

 </body>

-</html>
\ No newline at end of file
+</html>

diff --git a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/package.html b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/package.html
index 7d7d546..ffa6b93 100644
--- a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/package.html
+++ b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/package.html
@@ -1,7 +1,14 @@
+#-------------------------------------------------------------------------------

+# Copyright (C) 2020 

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v2.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v20.html

+#-------------------------------------------------------------------------------

 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

 <html>

 <head></head>

 <body>

   Provides...

 </body>

-</html>
\ No newline at end of file
+</html>

diff --git a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/Bin.java b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/Bin.java
index 9b5b40b..e2a305d 100644
--- a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/Bin.java
+++ b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/Bin.java
@@ -1,100 +1,107 @@
-/*------------------------------------------------------------------------------
-  -
-  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 
-  - 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:
-  -
-  - Alessandro Zovi azovi@math.unipd.it
-  - Stefano Puri stefano.puri@intecs.it
-  - Laura Baracchi laura.baracchi@intecs.it
-  - Nicholas Pacini nicholas.pacini@intecs.it  
-  -
-  - Initial API and implementation and/or initial documentation
-  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.partitioning;
-
-/**
- * The Class Bin.
- */
-public class Bin {
-	
-	/** The id. */
-	private Integer id;
-	
-	/** The size. */
-	private Float size = 1.0f; // only homogeneous multiprocessing in CONCERTO
-	
-	/** The capacity. */
-	private Float capacity = 0.0f;
-	
-	/** The level. */
-	private Integer level = new Integer(-1); // needed for RUN packing, default is leaf node
-	
-	/**
-	 * Gets the level.
-	 *
-	 * @return the level
-	 */
-	public Integer getLevel() {
-		return level;
-	}
-
-	/**
-	 * Sets the level.
-	 *
-	 * @param level the new level
-	 */
-	public void setLevel(Integer level) {
-		this.level = level;
-	}
-
-	/**
-	 * Gets the id.
-	 *
-	 * @return the id
-	 */
-	public Integer getId() {
-		return id;
-	}
-
-	/**
-	 * Sets the capacity.
-	 *
-	 * @param capacity the new capacity
-	 */
-	public void setCapacity(Float capacity) {
-		this.capacity = capacity;
-	}
-
-	/**
-	 * Gets the size.
-	 *
-	 * @return the size
-	 */
-	public Float getSize() {
-		return size;
-	}
-
-	/**
-	 * Gets the capacity.
-	 *
-	 * @return the capacity
-	 */
-	public Float getCapacity() {
-		return capacity;
-	}
-
-	/**
-	 * Instantiates a new bin.
-	 *
-	 * @param id the id
-	 */
-	public Bin(Integer id) {
-		super();
-		this.id = id;
-	}
-
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+/*------------------------------------------------------------------------------

+  -

+  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 

+  - All rights reserved. This program and the accompanying materials

+  - are made available under the terms of the Eclipse Public License v2.0

+  - which accompanies this distribution, and is available at

+  - http://www.eclipse.org/legal/epl-v20.html

+  -

+  - Contributors:

+  -

+  - Alessandro Zovi azovi@math.unipd.it

+  - Stefano Puri stefano.puri@intecs.it

+  - Laura Baracchi laura.baracchi@intecs.it

+  - Nicholas Pacini nicholas.pacini@intecs.it  

+  -

+  - Initial API and implementation and/or initial documentation

+  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.partitioning;

+

+/**

+ * The Class Bin.

+ */

+public class Bin {

+	

+	/** The id. */

+	private Integer id;

+	

+	/** The size. */

+	private Float size = 1.0f; // only homogeneous multiprocessing in CONCERTO

+	

+	/** The capacity. */

+	private Float capacity = 0.0f;

+	

+	/** The level. */

+	private Integer level = new Integer(-1); // needed for RUN packing, default is leaf node

+	

+	/**

+	 * Gets the level.

+	 *

+	 * @return the level

+	 */

+	public Integer getLevel() {

+		return level;

+	}

+

+	/**

+	 * Sets the level.

+	 *

+	 * @param level the new level

+	 */

+	public void setLevel(Integer level) {

+		this.level = level;

+	}

+

+	/**

+	 * Gets the id.

+	 *

+	 * @return the id

+	 */

+	public Integer getId() {

+		return id;

+	}

+

+	/**

+	 * Sets the capacity.

+	 *

+	 * @param capacity the new capacity

+	 */

+	public void setCapacity(Float capacity) {

+		this.capacity = capacity;

+	}

+

+	/**

+	 * Gets the size.

+	 *

+	 * @return the size

+	 */

+	public Float getSize() {

+		return size;

+	}

+

+	/**

+	 * Gets the capacity.

+	 *

+	 * @return the capacity

+	 */

+	public Float getCapacity() {

+		return capacity;

+	}

+

+	/**

+	 * Instantiates a new bin.

+	 *

+	 * @param id the id

+	 */

+	public Bin(Integer id) {

+		super();

+		this.id = id;

+	}

+

+}

diff --git a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/BinPacker.java b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/BinPacker.java
index a976407..98acea0 100644
--- a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/BinPacker.java
+++ b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/BinPacker.java
@@ -1,35 +1,42 @@
-/*------------------------------------------------------------------------------
-  -
-  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 
-  - 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:
-  -
-  - Alessandro Zovi azovi@math.unipd.it
-  - Stefano Puri stefano.puri@intecs.it
-  - Laura Baracchi laura.baracchi@intecs.it
-  - Nicholas Pacini nicholas.pacini@intecs.it  
-  -
-  - Initial API and implementation and/or initial documentation
-  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.partitioning;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * The Interface BinPacker.
- */
-public interface BinPacker {
-
-	/**
-	 * Pack.
-	 *
-	 * @param bins the bins
-	 * @param tasks the tasks
-	 * @return the map
-	 */
-	public Map<Bin, List<Task>> pack(List<Bin> bins, List<Task> tasks);
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+/*------------------------------------------------------------------------------

+  -

+  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 

+  - All rights reserved. This program and the accompanying materials

+  - are made available under the terms of the Eclipse Public License v2.0

+  - which accompanies this distribution, and is available at

+  - http://www.eclipse.org/legal/epl-v20.html

+  -

+  - Contributors:

+  -

+  - Alessandro Zovi azovi@math.unipd.it

+  - Stefano Puri stefano.puri@intecs.it

+  - Laura Baracchi laura.baracchi@intecs.it

+  - Nicholas Pacini nicholas.pacini@intecs.it  

+  -

+  - Initial API and implementation and/or initial documentation

+  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.partitioning;

+

+import java.util.List;

+import java.util.Map;

+

+/**

+ * The Interface BinPacker.

+ */

+public interface BinPacker {

+

+	/**

+	 * Pack.

+	 *

+	 * @param bins the bins

+	 * @param tasks the tasks

+	 * @return the map

+	 */

+	public Map<Bin, List<Task>> pack(List<Bin> bins, List<Task> tasks);

+}

diff --git a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/BinPackerFactory.java b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/BinPackerFactory.java
index 46d2ec3..123725c 100644
--- a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/BinPackerFactory.java
+++ b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/BinPackerFactory.java
@@ -1,175 +1,182 @@
-package org.polarsys.chess.multicore.partitioning;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-/**
- * Factory for bin packing algorithms.
- * @author andrea
- *
- */
-public class BinPackerFactory {
-	
-/**
- * Gets the bin packer.
- *
- * @param heuristic the heuristic
- * @return the bin packer
- */
-public static BinPacker getBinPacker(Heuristic heuristic){
-		
-		BinPacker packer;
-		switch(heuristic){
-		case WORST_FIT:
-			packer = new WorstFitBinPacker();
-			break;
-		default:
-			packer = new WorstFitBinPacker();
-			break;
-		}
-		return packer;
-	}
-	
-	
-	/**
-	 * The main method.
-	 *
-	 * @param args the arguments
-	 */
-	public static void main(String[] args){
-		
-		int nr_bins = 2;
-		List<Bin> allBins = new ArrayList<Bin>();
-		List<Task> allTasks = new ArrayList<Task>();
-		
-
-//		allTasks.add(new Task("Task1", 20.0f, 100.0f, 100.0f, 0.0f, null));
-////		allTasks.add(new Task("Task2", 15.0f, 100.0f, 100.0f, 0.0f, null));
-////		allTasks.add(new Task("Task22", 15.0f, 100.0f, 100.0f, 0.0f, null));
-//		allTasks.add(new Task("Task11", 25.0f, 100.0f, 100.0f, 0.0f, null));
-//		allTasks.add(new Task("Task3", 85.0f, 100.0f, 100.0f, 0.0f, null));
-//		allTasks.add(new Task("Task4", 80.0f, 100.0f, 100.0f, 0.0f, null));
-		
-		// 3 levels in the reduction tree
-		allTasks.add(new Task("Task1", 60.0f, 100.0f, 100.0f, 0.0f, null));
-		allTasks.add(new Task("Task2", 60.0f, 100.0f, 100.0f, 0.0f, null));
-		allTasks.add(new Task("Task3", 30.0f, 100.0f, 100.0f, 0.0f, null));
-		allTasks.add(new Task("Task4", 30.0f, 100.0f, 100.0f, 0.0f, null));
-		allTasks.add(new Task("Task5", 60.0f, 100.0f, 100.0f, 0.0f, null));
-		allTasks.add(new Task("Task6", 30.0f, 100.0f, 100.0f, 0.0f, null));
-		allTasks.add(new Task("Task7", 30.0f, 100.0f, 100.0f, 0.0f, null));
-		allTasks.add(new Task("Task8", 30.0f, 100.0f, 100.0f, 0.0f, null));
-		allTasks.add(new Task("Task9", 60.0f, 100.0f, 100.0f, 0.0f, null));
-		
-		Map<Bin, List<Task>> firstPacking = BinPackerFactory.getBinPacker(Heuristic.WORST_FIT).pack(allBins, allTasks);
-		for(java.util.Map.Entry<Bin, List<Task>> row : firstPacking.entrySet()){
-			System.out.print("LEVEL "+row.getKey().getLevel()+"-"+row.getKey().getId()+"(U="+row.getKey().getCapacity()+") -> {");
-			for(Task t : row.getValue()) System.out.print(" "+t.getId()+",");
-			System.out.println("}");
-		}
-		if(firstPacking.size() > allBins.size()){
-			System.out.println("Starting RUN packing");
-			allTasks = new ArrayList<Task>();
-			for(Bin bin : firstPacking.keySet())
-				allTasks.add(new Task(bin.getId().toString(), bin.getCapacity()));
-			Map<Bin, List<Task>> reductionTree = new RUNReduction().pack(null, allTasks);
-			for(java.util.Map.Entry<Bin, List<Task>> row : reductionTree.entrySet()){
-				System.out.print("LEVEL "+row.getKey().getLevel()+"-"+row.getKey().getId()+"(U="+row.getKey().getCapacity()+") -> {");
-				for(Task t : row.getValue()) System.out.print(" "+t.getId()+",");
-				System.out.println("}");
-			}
-			printMASTinput(firstPacking, reductionTree);
-		}
-	}
-	
-	/**
-	 * Prints the MAS tinput.
-	 *
-	 * @param firstPack the first pack
-	 * @param reductionTree the reduction tree
-	 */
-	private static void printMASTinput(Map<Bin, List<Task>> firstPack, Map<Bin, List<Task>> reductionTree){
-		Object[] firstPackSorted = firstPack.entrySet().toArray();
-		Arrays.sort(firstPackSorted, new Comparator<Object>() {
-
-			@Override
-			public int compare(Object o1, Object o2) {
-				if(((Entry<Bin, List<Task>>)o1).getKey().getId()>((Entry<Bin, List<Task>>)o2).getKey().getId())
-					return 1;
-				else if (((Entry<Bin, List<Task>>)o1).getKey().getId()<((Entry<Bin, List<Task>>)o2).getKey().getId())
-					return -1;
-				else
-					return 0;
-		}});
-		
-//		for(int i=0; i<firstPackSorted.length; i++)
-//			System.out.println(((Entry<Bin, List<Task>>)firstPackSorted[i]).getKey().getId());
-		
-		Object[] allBins = reductionTree.keySet().toArray();
-		Arrays.sort(allBins, new Comparator<Object>() {
-
-				@Override
-				public int compare(Object o1, Object o2) {
-					if(((Bin)o1).getLevel()>((Bin)o2).getLevel())
-						return -1;
-					else if (((Bin)o1).getLevel()<((Bin)o2).getLevel())
-						return 1;
-					else
-						return 0;
-			}});
-		
-		// DEPTH-FIRST print
-		// root level
-		int maxLevel = ((Bin)allBins[0]).getLevel();
-		System.out.println("-- Primary Schedulers\n");
-		System.out.println("Scheduler (");
-		System.out.println("	Type	=> Primary_Scheduler,");
-		System.out.println("	Name	=> Scheduler_1,");
-		System.out.println("	Policy	=> ( Type => RUN ),");
-		System.out.println("	Host	=> Multicore_1 );");//TODO: depends on CHRT specification
-		System.out.println("\n-- Primary Scheduling Servers and Secondary Schedulers\n");
-		int indexSupertask =0;
-		// all levels of the tree in the interval (root,0]
-		for(int i=1; (i<allBins.length)&&(((Bin)allBins[i]).getLevel()>=0); i++){
-			System.out.println("--*************** BRANCH ***************");
-			System.out.println("Scheduling_Server (");
-			System.out.println("	Type				=> Regular,");
-			System.out.println("	Name				=> SuperTask_"+indexSupertask+",");
-			System.out.println("	Server_Sched_parameters		=> ( Type => RUN_Supertask,");
-			System.out.println("					     Utilization => "+((Bin)allBins[i]).getCapacity()+" ),"); //FIXME: utilization is not expressed as U in Geoffrey's example
-			System.out.println("	Scheduler			=> Scheduler_1 );");
-			System.out.println();
-			System.out.println("Scheduler (");
-			System.out.println("	Type	=> Secondary_Scheduler,");
-			System.out.println("	Name	=> SecondaryScheduler_"+indexSupertask+",");
-			System.out.println("	Policy	=> ( 	Type	=> EDF,");
-			System.out.println("			Worst_Context_Switch	=> 20 ),");//FIXME: based on Compagnin paper at ECRTS2014
-			System.out.println("	Server	=> SuperTask_"+indexSupertask+" );");
-			System.out.println();
-			// first pack: print leaf nodes
-			if(((Bin)allBins[i]).getLevel()==0){
-				List<Task> tasks = reductionTree.get(((Bin)allBins[i]));
-				for(Task task : tasks){
-					List<Task> leaves = ((Entry<Bin, List<Task>>)firstPackSorted[new Integer(task.getId())]).getValue();
-					for(Task leaf : leaves){
-						System.out.println("Scheduling_Server (");
-						System.out.println("	Type				=> Regular,");
-						System.out.println("	Name 				=> "+leaf.getId()+",");
-						System.out.println("	Server_Sched_Parameters		=> (");
-						System.out.println("		Type			=> EDF_policy,");
-						System.out.println("		Deadline		=> "+leaf.getT()+",");
-						System.out.println("                Preassigned             => No),");
-						System.out.println("	Scheduler			=> SecondaryScheduler_"+indexSupertask+");");
-						System.out.println();
-					}
-				}
-			}
-			indexSupertask++;
-		}		
-	}
-
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+package org.polarsys.chess.multicore.partitioning;

+

+import java.util.ArrayList;

+import java.util.Arrays;

+import java.util.Comparator;

+import java.util.List;

+import java.util.Map;

+import java.util.Map.Entry;

+

+/**

+ * Factory for bin packing algorithms.

+ * @author andrea

+ *

+ */

+public class BinPackerFactory {

+	

+/**

+ * Gets the bin packer.

+ *

+ * @param heuristic the heuristic

+ * @return the bin packer

+ */

+public static BinPacker getBinPacker(Heuristic heuristic){

+		

+		BinPacker packer;

+		switch(heuristic){

+		case WORST_FIT:

+			packer = new WorstFitBinPacker();

+			break;

+		default:

+			packer = new WorstFitBinPacker();

+			break;

+		}

+		return packer;

+	}

+	

+	

+	/**

+	 * The main method.

+	 *

+	 * @param args the arguments

+	 */

+	public static void main(String[] args){

+		

+		int nr_bins = 2;

+		List<Bin> allBins = new ArrayList<Bin>();

+		List<Task> allTasks = new ArrayList<Task>();

+		

+

+//		allTasks.add(new Task("Task1", 20.0f, 100.0f, 100.0f, 0.0f, null));

+////		allTasks.add(new Task("Task2", 15.0f, 100.0f, 100.0f, 0.0f, null));

+////		allTasks.add(new Task("Task22", 15.0f, 100.0f, 100.0f, 0.0f, null));

+//		allTasks.add(new Task("Task11", 25.0f, 100.0f, 100.0f, 0.0f, null));

+//		allTasks.add(new Task("Task3", 85.0f, 100.0f, 100.0f, 0.0f, null));

+//		allTasks.add(new Task("Task4", 80.0f, 100.0f, 100.0f, 0.0f, null));

+		

+		// 3 levels in the reduction tree

+		allTasks.add(new Task("Task1", 60.0f, 100.0f, 100.0f, 0.0f, null));

+		allTasks.add(new Task("Task2", 60.0f, 100.0f, 100.0f, 0.0f, null));

+		allTasks.add(new Task("Task3", 30.0f, 100.0f, 100.0f, 0.0f, null));

+		allTasks.add(new Task("Task4", 30.0f, 100.0f, 100.0f, 0.0f, null));

+		allTasks.add(new Task("Task5", 60.0f, 100.0f, 100.0f, 0.0f, null));

+		allTasks.add(new Task("Task6", 30.0f, 100.0f, 100.0f, 0.0f, null));

+		allTasks.add(new Task("Task7", 30.0f, 100.0f, 100.0f, 0.0f, null));

+		allTasks.add(new Task("Task8", 30.0f, 100.0f, 100.0f, 0.0f, null));

+		allTasks.add(new Task("Task9", 60.0f, 100.0f, 100.0f, 0.0f, null));

+		

+		Map<Bin, List<Task>> firstPacking = BinPackerFactory.getBinPacker(Heuristic.WORST_FIT).pack(allBins, allTasks);

+		for(java.util.Map.Entry<Bin, List<Task>> row : firstPacking.entrySet()){

+			System.out.print("LEVEL "+row.getKey().getLevel()+"-"+row.getKey().getId()+"(U="+row.getKey().getCapacity()+") -> {");

+			for(Task t : row.getValue()) System.out.print(" "+t.getId()+",");

+			System.out.println("}");

+		}

+		if(firstPacking.size() > allBins.size()){

+			System.out.println("Starting RUN packing");

+			allTasks = new ArrayList<Task>();

+			for(Bin bin : firstPacking.keySet())

+				allTasks.add(new Task(bin.getId().toString(), bin.getCapacity()));

+			Map<Bin, List<Task>> reductionTree = new RUNReduction().pack(null, allTasks);

+			for(java.util.Map.Entry<Bin, List<Task>> row : reductionTree.entrySet()){

+				System.out.print("LEVEL "+row.getKey().getLevel()+"-"+row.getKey().getId()+"(U="+row.getKey().getCapacity()+") -> {");

+				for(Task t : row.getValue()) System.out.print(" "+t.getId()+",");

+				System.out.println("}");

+			}

+			printMASTinput(firstPacking, reductionTree);

+		}

+	}

+	

+	/**

+	 * Prints the MAS tinput.

+	 *

+	 * @param firstPack the first pack

+	 * @param reductionTree the reduction tree

+	 */

+	private static void printMASTinput(Map<Bin, List<Task>> firstPack, Map<Bin, List<Task>> reductionTree){

+		Object[] firstPackSorted = firstPack.entrySet().toArray();

+		Arrays.sort(firstPackSorted, new Comparator<Object>() {

+

+			@Override

+			public int compare(Object o1, Object o2) {

+				if(((Entry<Bin, List<Task>>)o1).getKey().getId()>((Entry<Bin, List<Task>>)o2).getKey().getId())

+					return 1;

+				else if (((Entry<Bin, List<Task>>)o1).getKey().getId()<((Entry<Bin, List<Task>>)o2).getKey().getId())

+					return -1;

+				else

+					return 0;

+		}});

+		

+//		for(int i=0; i<firstPackSorted.length; i++)

+//			System.out.println(((Entry<Bin, List<Task>>)firstPackSorted[i]).getKey().getId());

+		

+		Object[] allBins = reductionTree.keySet().toArray();

+		Arrays.sort(allBins, new Comparator<Object>() {

+

+				@Override

+				public int compare(Object o1, Object o2) {

+					if(((Bin)o1).getLevel()>((Bin)o2).getLevel())

+						return -1;

+					else if (((Bin)o1).getLevel()<((Bin)o2).getLevel())

+						return 1;

+					else

+						return 0;

+			}});

+		

+		// DEPTH-FIRST print

+		// root level

+		int maxLevel = ((Bin)allBins[0]).getLevel();

+		System.out.println("-- Primary Schedulers\n");

+		System.out.println("Scheduler (");

+		System.out.println("	Type	=> Primary_Scheduler,");

+		System.out.println("	Name	=> Scheduler_1,");

+		System.out.println("	Policy	=> ( Type => RUN ),");

+		System.out.println("	Host	=> Multicore_1 );");//TODO: depends on CHRT specification

+		System.out.println("\n-- Primary Scheduling Servers and Secondary Schedulers\n");

+		int indexSupertask =0;

+		// all levels of the tree in the interval (root,0]

+		for(int i=1; (i<allBins.length)&&(((Bin)allBins[i]).getLevel()>=0); i++){

+			System.out.println("--*************** BRANCH ***************");

+			System.out.println("Scheduling_Server (");

+			System.out.println("	Type				=> Regular,");

+			System.out.println("	Name				=> SuperTask_"+indexSupertask+",");

+			System.out.println("	Server_Sched_parameters		=> ( Type => RUN_Supertask,");

+			System.out.println("					     Utilization => "+((Bin)allBins[i]).getCapacity()+" ),"); //FIXME: utilization is not expressed as U in Geoffrey's example

+			System.out.println("	Scheduler			=> Scheduler_1 );");

+			System.out.println();

+			System.out.println("Scheduler (");

+			System.out.println("	Type	=> Secondary_Scheduler,");

+			System.out.println("	Name	=> SecondaryScheduler_"+indexSupertask+",");

+			System.out.println("	Policy	=> ( 	Type	=> EDF,");

+			System.out.println("			Worst_Context_Switch	=> 20 ),");//FIXME: based on Compagnin paper at ECRTS2014

+			System.out.println("	Server	=> SuperTask_"+indexSupertask+" );");

+			System.out.println();

+			// first pack: print leaf nodes

+			if(((Bin)allBins[i]).getLevel()==0){

+				List<Task> tasks = reductionTree.get(((Bin)allBins[i]));

+				for(Task task : tasks){

+					List<Task> leaves = ((Entry<Bin, List<Task>>)firstPackSorted[new Integer(task.getId())]).getValue();

+					for(Task leaf : leaves){

+						System.out.println("Scheduling_Server (");

+						System.out.println("	Type				=> Regular,");

+						System.out.println("	Name 				=> "+leaf.getId()+",");

+						System.out.println("	Server_Sched_Parameters		=> (");

+						System.out.println("		Type			=> EDF_policy,");

+						System.out.println("		Deadline		=> "+leaf.getT()+",");

+						System.out.println("                Preassigned             => No),");

+						System.out.println("	Scheduler			=> SecondaryScheduler_"+indexSupertask+");");

+						System.out.println();

+					}

+				}

+			}

+			indexSupertask++;

+		}		

+	}

+

+}

diff --git a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/Heuristic.java b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/Heuristic.java
index 713dbf9..465824b 100644
--- a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/Heuristic.java
+++ b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/Heuristic.java
@@ -1,27 +1,34 @@
-/*------------------------------------------------------------------------------
-  -
-  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 
-  - 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:
-  -
-  - Alessandro Zovi azovi@math.unipd.it
-  - Stefano Puri stefano.puri@intecs.it
-  - Laura Baracchi laura.baracchi@intecs.it
-  - Nicholas Pacini nicholas.pacini@intecs.it  
-  -
-  - Initial API and implementation and/or initial documentation
-  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.partitioning;
-
-/**
- * The Enum Heuristic.
- */
-public enum Heuristic {
-	
-	/** The worst fit. */
-	WORST_FIT
-
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+/*------------------------------------------------------------------------------

+  -

+  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 

+  - All rights reserved. This program and the accompanying materials

+  - are made available under the terms of the Eclipse Public License v2.0

+  - which accompanies this distribution, and is available at

+  - http://www.eclipse.org/legal/epl-v20.html

+  -

+  - Contributors:

+  -

+  - Alessandro Zovi azovi@math.unipd.it

+  - Stefano Puri stefano.puri@intecs.it

+  - Laura Baracchi laura.baracchi@intecs.it

+  - Nicholas Pacini nicholas.pacini@intecs.it  

+  -

+  - Initial API and implementation and/or initial documentation

+  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.partitioning;

+

+/**

+ * The Enum Heuristic.

+ */

+public enum Heuristic {

+	

+	/** The worst fit. */

+	WORST_FIT

+

+}

diff --git a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/RUNReduction.java b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/RUNReduction.java
index b0e95ac..2a416e2 100644
--- a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/RUNReduction.java
+++ b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/RUNReduction.java
@@ -1,81 +1,88 @@
-/*------------------------------------------------------------------------------
-  -
-  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 
-  - 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:
-  -
-  - Alessandro Zovi azovi@math.unipd.it
-  - Stefano Puri stefano.puri@intecs.it
-  - Laura Baracchi laura.baracchi@intecs.it
-  - Nicholas Pacini nicholas.pacini@intecs.it  
-  -
-  - Initial API and implementation and/or initial documentation
-  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.partitioning;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * The Class RUNReduction.
- */
-public class RUNReduction implements BinPacker {
-	
-	/** The level. */
-	//private final boolean DECREASING_ORDERING = true;
-	int level = -1;
-
-	/* (non-Javadoc)
-	 * @see org.polarsys.chess.multicore.partitioning.BinPacker#pack(java.util.List, java.util.List)
-	 */
-	@Override
-	public Map<Bin, List<Task>> pack(List<Bin> bins, List<Task> tasks) {
-		
-		level++;
-		Map<Bin, List<Task>> toReturn = new Hashtable<Bin, List<Task>> ();
-		
-		
-		if(tasks.size()==1){
-			//toReturn.put(new Bin(new Integer(tasks.get(0).getId())), tasks);
-			Bin theBin = new Bin(0);
-			theBin.setLevel(level);
-			toReturn.put(theBin, tasks);
-			return toReturn;
-		}
-		
-		for(Task task : tasks)
-			task.switchToDual();
-		
-//		Object[] allTasks = tasks.toArray();
-//		for(int taskIndex = 0; taskIndex < allTasks.length; taskIndex++)
-//			((Task)allTasks[taskIndex]).switchToDual();
-		
-		Map<Bin, List<Task>> result =
-				BinPackerFactory.getBinPacker(org.polarsys.chess.multicore.partitioning.Heuristic.WORST_FIT).pack(new ArrayList<Bin>(), tasks);
-		Set<Bin> keys = result.keySet();
-		ArrayList<Task> supertasks = new ArrayList<Task>();
-		for(Bin bin : keys){
-			bin.setLevel(level);
-			toReturn.put(bin, result.get(bin));
-			supertasks.add(new Task(bin.getId().toString(), bin.getCapacity()));
-		}
-		
-		toReturn.putAll(pack(null, supertasks));// recursive call on the level above
-		return toReturn;
-		
-		
-		
-		
-		
-		//return toReturn;
-	}
-
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+/*------------------------------------------------------------------------------

+  -

+  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 

+  - All rights reserved. This program and the accompanying materials

+  - are made available under the terms of the Eclipse Public License v2.0

+  - which accompanies this distribution, and is available at

+  - http://www.eclipse.org/legal/epl-v20.html

+  -

+  - Contributors:

+  -

+  - Alessandro Zovi azovi@math.unipd.it

+  - Stefano Puri stefano.puri@intecs.it

+  - Laura Baracchi laura.baracchi@intecs.it

+  - Nicholas Pacini nicholas.pacini@intecs.it  

+  -

+  - Initial API and implementation and/or initial documentation

+  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.partitioning;

+

+import java.util.ArrayList;

+import java.util.Arrays;

+import java.util.Comparator;

+import java.util.Hashtable;

+import java.util.List;

+import java.util.Map;

+import java.util.Set;

+

+/**

+ * The Class RUNReduction.

+ */

+public class RUNReduction implements BinPacker {

+	

+	/** The level. */

+	//private final boolean DECREASING_ORDERING = true;

+	int level = -1;

+

+	/* (non-Javadoc)

+	 * @see org.polarsys.chess.multicore.partitioning.BinPacker#pack(java.util.List, java.util.List)

+	 */

+	@Override

+	public Map<Bin, List<Task>> pack(List<Bin> bins, List<Task> tasks) {

+		

+		level++;

+		Map<Bin, List<Task>> toReturn = new Hashtable<Bin, List<Task>> ();

+		

+		

+		if(tasks.size()==1){

+			//toReturn.put(new Bin(new Integer(tasks.get(0).getId())), tasks);

+			Bin theBin = new Bin(0);

+			theBin.setLevel(level);

+			toReturn.put(theBin, tasks);

+			return toReturn;

+		}

+		

+		for(Task task : tasks)

+			task.switchToDual();

+		

+//		Object[] allTasks = tasks.toArray();

+//		for(int taskIndex = 0; taskIndex < allTasks.length; taskIndex++)

+//			((Task)allTasks[taskIndex]).switchToDual();

+		

+		Map<Bin, List<Task>> result =

+				BinPackerFactory.getBinPacker(org.polarsys.chess.multicore.partitioning.Heuristic.WORST_FIT).pack(new ArrayList<Bin>(), tasks);

+		Set<Bin> keys = result.keySet();

+		ArrayList<Task> supertasks = new ArrayList<Task>();

+		for(Bin bin : keys){

+			bin.setLevel(level);

+			toReturn.put(bin, result.get(bin));

+			supertasks.add(new Task(bin.getId().toString(), bin.getCapacity()));

+		}

+		

+		toReturn.putAll(pack(null, supertasks));// recursive call on the level above

+		return toReturn;

+		

+		

+		

+		

+		

+		//return toReturn;

+	}

+

+}

diff --git a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/Task.java b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/Task.java
index 0b7d48e..9be7806 100644
--- a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/Task.java
+++ b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/Task.java
@@ -1,195 +1,202 @@
-/*------------------------------------------------------------------------------
-  -
-  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 
-  - 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:
-  -
-  - Alessandro Zovi azovi@math.unipd.it
-  - Stefano Puri stefano.puri@intecs.it
-  - Laura Baracchi laura.baracchi@intecs.it
-  - Nicholas Pacini nicholas.pacini@intecs.it  
-  -
-  - Initial API and implementation and/or initial documentation
-  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.partitioning;
-
-
-
-/**
- * The Class Task.
- */
-public class Task implements Comparable<Task> {
-	
-	/**
-	 * The Enum Definition.
-	 */
-	private enum Definition{
-		
-		/** The defined c and t. */
-		DEFINED_C_AND_T, 
- /** The defined u. */
- DEFINED_U
-	}
-
-	/** The id. */
-	private String id;
-	
-	/** The definition. */
-	private Definition definition;
-	
-	/** The c. */
-	private Float c;
-	
-	/** The d. */
-	private Float d;
-	
-	/** The t. */
-	private Float t;
-	
-	/** The u. */
-	private Float u;
-	
-	/** The offset. */
-	private Float offset;
-	
-	/** The owner. */
-	private Bin owner;
-	
-	/**
-	 * Instantiates a new task.
-	 *
-	 * @param _name the name
-	 * @param _c the c
-	 * @param _d the d
-	 * @param _t the t
-	 * @param _offset the offset
-	 * @param _owner the owner
-	 */
-	public Task(String _name,
-			Float _c, Float _d, Float _t, Float _offset,
-			Bin _owner) {
-		
-
-		this.id = _name;
-		this.c = _c;
-		this.d = _d;
-		this.t = _t;
-		this.definition = Definition.DEFINED_C_AND_T;
-		this.offset = _offset;
-		this.owner = _owner;
-		
-	}
-	
-	/**
-	 * Instantiates a new task.
-	 *
-	 * @param _name the name
-	 * @param _u the u
-	 */
-	// needed for RUN's supertasks
-	public Task(String _name, Float _u){
-		this.id = _name;
-		this.u = _u;
-		this.definition = Definition.DEFINED_U;
-	}
-	
-//	public Task() {
-//		super();
-//	}
-	
-	/**
- * Sets the owner.
- *
- * @param owner the new owner
- */
-public void setOwner(Bin owner) {
-		this.owner = owner;
-	}
-
-	/**
-	 * Sets the t.
-	 *
-	 * @param t the new t
-	 */
-	public void setT(Float t) {
-		this.t = t;
-	}
-
-	/**
-	 * Gets the owner.
-	 *
-	 * @return the owner
-	 */
-	public Bin getOwner() {
-		return owner;
-	}
-
-	/**
-	 * Gets the t.
-	 *
-	 * @return the t
-	 */
-	public Float getT() {
-		return t;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return new String("(name, C, D, T, offset, owner)\n" +
-				"("+ id +", "+ c +", "+ d +", "+ t +", "+ offset +", "+ owner +")");
-	}
-	
-	/**
-	 * Gets the u.
-	 *
-	 * @return the u
-	 */
-	public Float getU(){
-		if(definition == Definition.DEFINED_U)
-			return u;
-		else
-			return c/t;
-	}
-		
-	
-	/**
-	 * Gets the id.
-	 *
-	 * @return the id
-	 */
-	public String getId() {
-		return id;
-	}
-	
-	/**
-	 * Switch to dual.
-	 */
-	public void switchToDual(){
-		if(definition == Definition.DEFINED_U)
-			this.u = 1-u;
-		else
-			this.c = t-c;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Comparable#compareTo(java.lang.Object)
-	 */
-	@Override
-	public int compareTo(Task o) {
-		
-		return this.getU().compareTo(o.getU());
-	}
-
-
-	
-
-	
-
-}
-
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+/*------------------------------------------------------------------------------

+  -

+  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 

+  - All rights reserved. This program and the accompanying materials

+  - are made available under the terms of the Eclipse Public License v2.0

+  - which accompanies this distribution, and is available at

+  - http://www.eclipse.org/legal/epl-v20.html

+  -

+  - Contributors:

+  -

+  - Alessandro Zovi azovi@math.unipd.it

+  - Stefano Puri stefano.puri@intecs.it

+  - Laura Baracchi laura.baracchi@intecs.it

+  - Nicholas Pacini nicholas.pacini@intecs.it  

+  -

+  - Initial API and implementation and/or initial documentation

+  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.partitioning;

+

+

+

+/**

+ * The Class Task.

+ */

+public class Task implements Comparable<Task> {

+	

+	/**

+	 * The Enum Definition.

+	 */

+	private enum Definition{

+		

+		/** The defined c and t. */

+		DEFINED_C_AND_T, 

+ /** The defined u. */

+ DEFINED_U

+	}

+

+	/** The id. */

+	private String id;

+	

+	/** The definition. */

+	private Definition definition;

+	

+	/** The c. */

+	private Float c;

+	

+	/** The d. */

+	private Float d;

+	

+	/** The t. */

+	private Float t;

+	

+	/** The u. */

+	private Float u;

+	

+	/** The offset. */

+	private Float offset;

+	

+	/** The owner. */

+	private Bin owner;

+	

+	/**

+	 * Instantiates a new task.

+	 *

+	 * @param _name the name

+	 * @param _c the c

+	 * @param _d the d

+	 * @param _t the t

+	 * @param _offset the offset

+	 * @param _owner the owner

+	 */

+	public Task(String _name,

+			Float _c, Float _d, Float _t, Float _offset,

+			Bin _owner) {

+		

+

+		this.id = _name;

+		this.c = _c;

+		this.d = _d;

+		this.t = _t;

+		this.definition = Definition.DEFINED_C_AND_T;

+		this.offset = _offset;

+		this.owner = _owner;

+		

+	}

+	

+	/**

+	 * Instantiates a new task.

+	 *

+	 * @param _name the name

+	 * @param _u the u

+	 */

+	// needed for RUN's supertasks

+	public Task(String _name, Float _u){

+		this.id = _name;

+		this.u = _u;

+		this.definition = Definition.DEFINED_U;

+	}

+	

+//	public Task() {

+//		super();

+//	}

+	

+	/**

+ * Sets the owner.

+ *

+ * @param owner the new owner

+ */

+public void setOwner(Bin owner) {

+		this.owner = owner;

+	}

+

+	/**

+	 * Sets the t.

+	 *

+	 * @param t the new t

+	 */

+	public void setT(Float t) {

+		this.t = t;

+	}

+

+	/**

+	 * Gets the owner.

+	 *

+	 * @return the owner

+	 */

+	public Bin getOwner() {

+		return owner;

+	}

+

+	/**

+	 * Gets the t.

+	 *

+	 * @return the t

+	 */

+	public Float getT() {

+		return t;

+	}

+

+	/* (non-Javadoc)

+	 * @see java.lang.Object#toString()

+	 */

+	@Override

+	public String toString() {

+		return new String("(name, C, D, T, offset, owner)\n" +

+				"("+ id +", "+ c +", "+ d +", "+ t +", "+ offset +", "+ owner +")");

+	}

+	

+	/**

+	 * Gets the u.

+	 *

+	 * @return the u

+	 */

+	public Float getU(){

+		if(definition == Definition.DEFINED_U)

+			return u;

+		else

+			return c/t;

+	}

+		

+	

+	/**

+	 * Gets the id.

+	 *

+	 * @return the id

+	 */

+	public String getId() {

+		return id;

+	}

+	

+	/**

+	 * Switch to dual.

+	 */

+	public void switchToDual(){

+		if(definition == Definition.DEFINED_U)

+			this.u = 1-u;

+		else

+			this.c = t-c;

+	}

+

+	/* (non-Javadoc)

+	 * @see java.lang.Comparable#compareTo(java.lang.Object)

+	 */

+	@Override

+	public int compareTo(Task o) {

+		

+		return this.getU().compareTo(o.getU());

+	}

+

+

+	

+

+	

+

+}

+

diff --git a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/WorstFitBinPacker.java b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/WorstFitBinPacker.java
index 177a0d3..7435abf 100644
--- a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/WorstFitBinPacker.java
+++ b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/WorstFitBinPacker.java
@@ -1,218 +1,225 @@
-/*------------------------------------------------------------------------------
-  -
-  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 
-  - 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:
-  -
-  - Alessandro Zovi azovi@math.unipd.it
-  - Stefano Puri stefano.puri@intecs.it
-  - Laura Baracchi laura.baracchi@intecs.it
-  - Nicholas Pacini nicholas.pacini@intecs.it  
-  -
-  - Initial API and implementation and/or initial documentation
-  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.partitioning;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
-/**
- * The Class WorstFitBinPacker.
- */
-public class WorstFitBinPacker implements BinPacker {
-	
-	/** The decreasing ordering. */
-	private final boolean DECREASING_ORDERING = true; 
-
-//	@Override
-//	public Map<Bin, List<Task>> pack(List<Bin> bins, List<Task> tasks) {		
-//		
-//		Map<Bin, List<Task>> toReturn = new Hashtable<Bin, List<Task>> ();
-//		// init output
-//		for(Bin bin : bins)
-//			toReturn.put(bin, new ArrayList<Task>());
-//		
-//		
-//		if(tasks.size() <= bins.size()){ // trivial packing
-//			int i =0;
-//			for(Task task : tasks){
-//				Bin bin = bins.get(i);
-//				ArrayList<Task> theList = new ArrayList<Task>();
-//				theList.add(task);
-//				bin.setCapacity(bin.getCapacity()+task.computeU());
-//				toReturn.put(bin, theList);
-//				i++;
-//			}
-//		} else {// nominal case
-//			
-//			// sort the tasks by increasing/decreasing utilisation
-//			Object[] allTasks = tasks.toArray();
-//			//Arrays.sort(allTasks);
-//			Arrays.sort(allTasks, new Comparator<Object>() {
-//
-//				@Override
-//				public int compare(Object o1, Object o2) {
-//					if(DECREASING_ORDERING)
-//						return -(((Task)o1).computeU()).compareTo(((Task)o2).computeU());
-//					else
-//						return (((Task)o1).computeU()).compareTo(((Task)o2).computeU());
-//				}
-//			});
-//			
-//			int indexEmptiestBin = 0;
-//			float emptiestCapacity = 0.0f;
-//			Object[] allBins = bins.toArray();
-//			
-//			
-//			for(int taskIndex = 0; taskIndex < allTasks.length; taskIndex++){
-//				
-//				Task task = (Task)allTasks[taskIndex];
-//				boolean found = false;
-//				
-//				Bin bin = (Bin)allBins[indexEmptiestBin];
-//				// try with emptiest bin
-//				if(bin.getCapacity() + task.computeU() <= bin.getSize())
-//					found = true;
-//				else { //try with other bins 
-//					for(int indexCurrentBin = 0; indexCurrentBin < allBins.length; indexCurrentBin++){
-//						if (indexCurrentBin == indexEmptiestBin) // already visited
-//							continue;
-//						bin =(Bin)allBins[indexCurrentBin];
-//						if(bin.getCapacity() + task.computeU() <= bin.getSize()){
-//							found = true;
-//							break;
-//						}
-//					}
-//				}
-//				
-//				if(!found)
-//					System.out.println("PACKING FAILED");
-//				else {
-//					task.setOwner(bin);
-//					bin.setCapacity(bin.getCapacity()+task.computeU());
-//					// store to output
-//					List<Task> theTasks = toReturn.get(bin);
-//					theTasks.add(task);
-//					toReturn.put(bin, theTasks);
-//					found = true;
-//					// update info on emptiest bin
-//					emptiestCapacity = Float.MAX_VALUE;
-//					for(int binIndex = 0; binIndex < allBins.length; binIndex++){
-//						float currentCapacity = ((Bin)allBins[binIndex]).getCapacity();
-//						if(currentCapacity < emptiestCapacity){
-//							emptiestCapacity = currentCapacity;
-//							indexEmptiestBin = binIndex;
-//						}
-//					}
-//				}
-//			}
-//			
-//		}
-//		return toReturn;
-//	}
-
-	/* (non-Javadoc)
- * @see org.polarsys.chess.multicore.partitioning.BinPacker#pack(java.util.List, java.util.List)
- */
-@Override
-	public Map<Bin, List<Task>> pack(List<Bin> bins, List<Task> tasks) {		
-		
-		Map<Bin, List<Task>> toReturn = new Hashtable<Bin, List<Task>> ();
-		
-		// init output
-//		for(Bin bin : bins)
-//			toReturn.put(bin, new ArrayList<Task>());
-		
-		
-		if(tasks.size() <= bins.size()){ // trivial packing
-			int i =0;
-			for(Task task : tasks){
-				Bin bin = bins.get(i);
-				ArrayList<Task> theList = new ArrayList<Task>();
-				theList.add(task);
-				bin.setCapacity(bin.getCapacity()+task.getU());
-				toReturn.put(bin, theList);
-				i++;
-			}
-		} else {// nominal case
-			
-			// sort the tasks by increasing/decreasing utilization
-			Object[] allTasks = tasks.toArray();
-			//Arrays.sort(allTasks);
-			Arrays.sort(allTasks, new Comparator<Object>() {
-
-				@Override
-				public int compare(Object o1, Object o2) {
-					if(DECREASING_ORDERING)
-						return -(((Task)o1).getU()).compareTo(((Task)o2).getU());
-					else
-						return (((Task)o1).getU()).compareTo(((Task)o2).getU());
-				}
-			});
-			
-			int indexEmptiestBin = 0;
-			float emptiestCapacity = 0.0f;
-			Object[] allBins = {new Bin(indexEmptiestBin)}; // ensure there is at least 1 bin even in case an empty list has been passed (this is the case during RUN reduction)
-			int indexLastBin = 0;
-			if(bins.size() > 0){
-				allBins = bins.toArray();
-				indexLastBin = bins.size()-1;
-			}
-				
-			
-			
-			for(int taskIndex = 0; taskIndex < allTasks.length; taskIndex++){
-				
-				Task task = (Task)allTasks[taskIndex];
-				Bin bin = (Bin)allBins[indexEmptiestBin];
-				// try with emptiest bin
-				if(bin.getCapacity() + task.getU() <= bin.getSize()){
-					task.setOwner(bin);
-					bin.setCapacity(bin.getCapacity()+task.getU());
-					// store to output
-					List<Task> theTasks = toReturn.get(bin);
-					if(theTasks == null) // needed because we don't initialize toReturn at the beginning, to provide input/output of variable size
-						theTasks = new ArrayList<Task>();
-					theTasks.add(task);
-					toReturn.put(bin, theTasks);
-				}
-				else {
-					//System.out.println("PARTITIONING FAILED, OPENING NEW BIN");
-					// open new bin
-					Bin newBin = new Bin(new Integer(++indexLastBin));
-					task.setOwner(newBin);
-					newBin.setCapacity(newBin.getCapacity()+task.getU());
-					ArrayList<Task> theList = new ArrayList<Task>();
-					theList.add(task);
-					toReturn.put(newBin, theList);
-					
-					// add bin to the common array 
-					Object[] tmpBinArray = Arrays.copyOf(allBins, allBins.length + 1);
-					assert(tmpBinArray.length -1 == indexLastBin);
-					tmpBinArray[indexLastBin] = newBin;
-					allBins = tmpBinArray;
-				}
-				
-				// update info on emptiest bin
-				emptiestCapacity = Float.MAX_VALUE;
-				for(int binIndex = 0; binIndex < allBins.length; binIndex++){
-					float currentCapacity = ((Bin)allBins[binIndex]).getCapacity();
-					if(currentCapacity < emptiestCapacity){
-						emptiestCapacity = currentCapacity;
-						indexEmptiestBin = binIndex;
-					}
-				}
-			}
-			
-		}
-		return toReturn;
-	}
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+/*------------------------------------------------------------------------------

+  -

+  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 

+  - All rights reserved. This program and the accompanying materials

+  - are made available under the terms of the Eclipse Public License v2.0

+  - which accompanies this distribution, and is available at

+  - http://www.eclipse.org/legal/epl-v20.html

+  -

+  - Contributors:

+  -

+  - Alessandro Zovi azovi@math.unipd.it

+  - Stefano Puri stefano.puri@intecs.it

+  - Laura Baracchi laura.baracchi@intecs.it

+  - Nicholas Pacini nicholas.pacini@intecs.it  

+  -

+  - Initial API and implementation and/or initial documentation

+  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.partitioning;

+

+import java.util.ArrayList;

+import java.util.Arrays;

+import java.util.Collection;

+import java.util.Comparator;

+import java.util.Hashtable;

+import java.util.List;

+import java.util.Map;

+

+/**

+ * The Class WorstFitBinPacker.

+ */

+public class WorstFitBinPacker implements BinPacker {

+	

+	/** The decreasing ordering. */

+	private final boolean DECREASING_ORDERING = true; 

+

+//	@Override

+//	public Map<Bin, List<Task>> pack(List<Bin> bins, List<Task> tasks) {		

+//		

+//		Map<Bin, List<Task>> toReturn = new Hashtable<Bin, List<Task>> ();

+//		// init output

+//		for(Bin bin : bins)

+//			toReturn.put(bin, new ArrayList<Task>());

+//		

+//		

+//		if(tasks.size() <= bins.size()){ // trivial packing

+//			int i =0;

+//			for(Task task : tasks){

+//				Bin bin = bins.get(i);

+//				ArrayList<Task> theList = new ArrayList<Task>();

+//				theList.add(task);

+//				bin.setCapacity(bin.getCapacity()+task.computeU());

+//				toReturn.put(bin, theList);

+//				i++;

+//			}

+//		} else {// nominal case

+//			

+//			// sort the tasks by increasing/decreasing utilisation

+//			Object[] allTasks = tasks.toArray();

+//			//Arrays.sort(allTasks);

+//			Arrays.sort(allTasks, new Comparator<Object>() {

+//

+//				@Override

+//				public int compare(Object o1, Object o2) {

+//					if(DECREASING_ORDERING)

+//						return -(((Task)o1).computeU()).compareTo(((Task)o2).computeU());

+//					else

+//						return (((Task)o1).computeU()).compareTo(((Task)o2).computeU());

+//				}

+//			});

+//			

+//			int indexEmptiestBin = 0;

+//			float emptiestCapacity = 0.0f;

+//			Object[] allBins = bins.toArray();

+//			

+//			

+//			for(int taskIndex = 0; taskIndex < allTasks.length; taskIndex++){

+//				

+//				Task task = (Task)allTasks[taskIndex];

+//				boolean found = false;

+//				

+//				Bin bin = (Bin)allBins[indexEmptiestBin];

+//				// try with emptiest bin

+//				if(bin.getCapacity() + task.computeU() <= bin.getSize())

+//					found = true;

+//				else { //try with other bins 

+//					for(int indexCurrentBin = 0; indexCurrentBin < allBins.length; indexCurrentBin++){

+//						if (indexCurrentBin == indexEmptiestBin) // already visited

+//							continue;

+//						bin =(Bin)allBins[indexCurrentBin];

+//						if(bin.getCapacity() + task.computeU() <= bin.getSize()){

+//							found = true;

+//							break;

+//						}

+//					}

+//				}

+//				

+//				if(!found)

+//					System.out.println("PACKING FAILED");

+//				else {

+//					task.setOwner(bin);

+//					bin.setCapacity(bin.getCapacity()+task.computeU());

+//					// store to output

+//					List<Task> theTasks = toReturn.get(bin);

+//					theTasks.add(task);

+//					toReturn.put(bin, theTasks);

+//					found = true;

+//					// update info on emptiest bin

+//					emptiestCapacity = Float.MAX_VALUE;

+//					for(int binIndex = 0; binIndex < allBins.length; binIndex++){

+//						float currentCapacity = ((Bin)allBins[binIndex]).getCapacity();

+//						if(currentCapacity < emptiestCapacity){

+//							emptiestCapacity = currentCapacity;

+//							indexEmptiestBin = binIndex;

+//						}

+//					}

+//				}

+//			}

+//			

+//		}

+//		return toReturn;

+//	}

+

+	/* (non-Javadoc)

+ * @see org.polarsys.chess.multicore.partitioning.BinPacker#pack(java.util.List, java.util.List)

+ */

+@Override

+	public Map<Bin, List<Task>> pack(List<Bin> bins, List<Task> tasks) {		

+		

+		Map<Bin, List<Task>> toReturn = new Hashtable<Bin, List<Task>> ();

+		

+		// init output

+//		for(Bin bin : bins)

+//			toReturn.put(bin, new ArrayList<Task>());

+		

+		

+		if(tasks.size() <= bins.size()){ // trivial packing

+			int i =0;

+			for(Task task : tasks){

+				Bin bin = bins.get(i);

+				ArrayList<Task> theList = new ArrayList<Task>();

+				theList.add(task);

+				bin.setCapacity(bin.getCapacity()+task.getU());

+				toReturn.put(bin, theList);

+				i++;

+			}

+		} else {// nominal case

+			

+			// sort the tasks by increasing/decreasing utilization

+			Object[] allTasks = tasks.toArray();

+			//Arrays.sort(allTasks);

+			Arrays.sort(allTasks, new Comparator<Object>() {

+

+				@Override

+				public int compare(Object o1, Object o2) {

+					if(DECREASING_ORDERING)

+						return -(((Task)o1).getU()).compareTo(((Task)o2).getU());

+					else

+						return (((Task)o1).getU()).compareTo(((Task)o2).getU());

+				}

+			});

+			

+			int indexEmptiestBin = 0;

+			float emptiestCapacity = 0.0f;

+			Object[] allBins = {new Bin(indexEmptiestBin)}; // ensure there is at least 1 bin even in case an empty list has been passed (this is the case during RUN reduction)

+			int indexLastBin = 0;

+			if(bins.size() > 0){

+				allBins = bins.toArray();

+				indexLastBin = bins.size()-1;

+			}

+				

+			

+			

+			for(int taskIndex = 0; taskIndex < allTasks.length; taskIndex++){

+				

+				Task task = (Task)allTasks[taskIndex];

+				Bin bin = (Bin)allBins[indexEmptiestBin];

+				// try with emptiest bin

+				if(bin.getCapacity() + task.getU() <= bin.getSize()){

+					task.setOwner(bin);

+					bin.setCapacity(bin.getCapacity()+task.getU());

+					// store to output

+					List<Task> theTasks = toReturn.get(bin);

+					if(theTasks == null) // needed because we don't initialize toReturn at the beginning, to provide input/output of variable size

+						theTasks = new ArrayList<Task>();

+					theTasks.add(task);

+					toReturn.put(bin, theTasks);

+				}

+				else {

+					//System.out.println("PARTITIONING FAILED, OPENING NEW BIN");

+					// open new bin

+					Bin newBin = new Bin(new Integer(++indexLastBin));

+					task.setOwner(newBin);

+					newBin.setCapacity(newBin.getCapacity()+task.getU());

+					ArrayList<Task> theList = new ArrayList<Task>();

+					theList.add(task);

+					toReturn.put(newBin, theList);

+					

+					// add bin to the common array 

+					Object[] tmpBinArray = Arrays.copyOf(allBins, allBins.length + 1);

+					assert(tmpBinArray.length -1 == indexLastBin);

+					tmpBinArray[indexLastBin] = newBin;

+					allBins = tmpBinArray;

+				}

+				

+				// update info on emptiest bin

+				emptiestCapacity = Float.MAX_VALUE;

+				for(int binIndex = 0; binIndex < allBins.length; binIndex++){

+					float currentCapacity = ((Bin)allBins[binIndex]).getCapacity();

+					if(currentCapacity < emptiestCapacity){

+						emptiestCapacity = currentCapacity;

+						indexEmptiestBin = binIndex;

+					}

+				}

+			}

+			

+		}

+		return toReturn;

+	}

+}

diff --git a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/package.html b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/package.html
index 7d7d546..ffa6b93 100644
--- a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/package.html
+++ b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/partitioning/package.html
@@ -1,7 +1,14 @@
+#-------------------------------------------------------------------------------

+# Copyright (C) 2020 

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v2.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v20.html

+#-------------------------------------------------------------------------------

 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

 <html>

 <head></head>

 <body>

   Provides...

 </body>

-</html>
\ No newline at end of file
+</html>

diff --git a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/utils/GeneratorUtils.java b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/utils/GeneratorUtils.java
index c42ae44..52105bf 100644
--- a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/utils/GeneratorUtils.java
+++ b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/utils/GeneratorUtils.java
@@ -1,220 +1,227 @@
-/*------------------------------------------------------------------------------
-  -
-  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 
-  - 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:
-  -
-  - Alessandro Zovi azovi@math.unipd.it
-  - Stefano Puri stefano.puri@intecs.it
-  - Laura Baracchi laura.baracchi@intecs.it
-  - Nicholas Pacini nicholas.pacini@intecs.it  
-  -
-  - Initial API and implementation and/or initial documentation
-  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.utils;
-
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaExecHost;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Assign;
-import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpConstraint;
-import org.eclipse.uml2.uml.Classifier;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.uml2.uml.Component;
-import org.eclipse.uml2.uml.Constraint;
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.uml2.uml.LiteralString;
-import org.eclipse.uml2.uml.UMLPackage;
-import org.eclipse.uml2.uml.ValueSpecification;
-import org.polarsys.chess.core.util.uml.UMLUtils;
-import org.polarsys.chess.multicore.model.CHCore;
-import org.polarsys.chess.multicore.model.CHTask;
-import org.polarsys.chess.multicore.model.SupertaskInfo;
-
-/**
- * The Class GeneratorUtils.
- */
-public class GeneratorUtils {
-
-	/** The Constant MARTE_ASSIGN. */
-	private static final String MARTE_ASSIGN = "MARTE::MARTE_Foundations::Alloc::Assign";
-	
-	/** The Constant MARTE_NFPCONSTRAINT. */
-	private static final String MARTE_NFPCONSTRAINT = "MARTE::MARTE_Foundations::NFPs::NfpConstraint";
-
-	/*
-	 * public static void buildTask2CoreAssociations(Component hwSystem,
-	 * EList<InstanceSpecification> processors, Map<CHCore, Set<CHTask>>
-	 * coresToCHTask) { for (CHCore core : coresToCHTask.keySet()) { for (CHTask o
-	 * : coresToCHTask.get(core)) {
-	 * 
-	 * Comment c = hwSystem.createOwnedComment(); UMLUtils.applyStereotype(c,
-	 * MARTE_ASSIGN); Assign assign = UMLUtils.getStereotypeApplication(c,
-	 * Assign.class);
-	 * 
-	 * assign.getFrom().add(o.getSlot().getBase_Slot());
-	 * assign.getTo().add(core.getProcessorInstance());
-	 * 
-	 * Constraint n = hwSystem.createOwnedRule(core.getName());
-	 * UMLUtils.applyStereotype(n, MARTE_NFPCONSTRAINT); NfpConstraint rule =
-	 * UMLUtils.getStereotypeApplication(n, NfpConstraint.class);
-	 * 
-	 * ValueSpecification valueSpec = n.createSpecification("core", null,
-	 * UMLPackage.Literals.LITERAL_STRING); LiteralString value = (LiteralString)
-	 * valueSpec; value.setValue(core.getName());
-	 * assign.getImpliedConstraint().add(rule);
-	 * 
-	 * } } }
-	 */
-
-	/**
-	 * Builds the task 2 super task associations.
-	 *
-	 * @param hwSystem the hw system
-	 * @param core2supertask the core 2 supertask
-	 * @param supertaskInfoList the supertask info list
-	 */
-	public static void buildTask2SuperTaskAssociations(Component hwSystem, HashMap<SupertaskInfo, LinkedHashSet<Object>> core2supertask, List<SupertaskInfo> supertaskInfoList) {
-
-		writeSupertaskinfo(supertaskInfoList);
-
-		for (SupertaskInfo supertask : core2supertask.keySet()) {
-			for (Object o : core2supertask.get(supertask)) {
-				if (!(o instanceof CHTask))
-					continue;
-
-				CHTask t = (CHTask) o;
-				Comment c = hwSystem.createOwnedComment();
-				UMLUtils.applyStereotype(c, MARTE_ASSIGN);
-				Assign assign = UMLUtils.getStereotypeApplication(c, Assign.class);
-				assign.getFrom().add(t.getSlot().getBase_Slot());
-				assign.getTo().add(supertask.getProcessorInstance());
-
-				{
-					Constraint n = hwSystem.createOwnedRule(supertask.getName());
-					UMLUtils.applyStereotype(n, MARTE_NFPCONSTRAINT);
-					NfpConstraint rule = UMLUtils.getStereotypeApplication(n, NfpConstraint.class);
-
-					ValueSpecification valueSpec = n.createSpecification("supertask", null, UMLPackage.Literals.LITERAL_STRING);
-					LiteralString value = (LiteralString) valueSpec;
-					value.setValue(supertask.getName());
-					assign.getImpliedConstraint().add(rule);
-				}
-
-				{
-					String context = t.getCHRtSpecification().getContext().getName();
-					Constraint n = hwSystem.createOwnedRule(context);
-					UMLUtils.applyStereotype(n, MARTE_NFPCONSTRAINT);
-					NfpConstraint rule = UMLUtils.getStereotypeApplication(n, NfpConstraint.class);
-
-					ValueSpecification valueSpec = n.createSpecification("context", null, UMLPackage.Literals.LITERAL_STRING);
-					LiteralString value = (LiteralString) valueSpec;
-					value.setValue(context);
-					assign.getImpliedConstraint().add(rule);
-				}
-
-			}
-		}
-	}
-
-	/**
-	 * Erase processor info.
-	 *
-	 * @param processorInstance the processor instance
-	 */
-	public static void eraseProcessorInfo(InstanceSpecification processorInstance) {
-		for (Classifier classifier : processorInstance.getClassifiers()) {
-			GaExecHost proc = UMLUtils.getStereotypeApplication(classifier, GaExecHost.class);
-			if (proc != null) {
-				proc.setOtherSchedPolicy("");
-			}
-		}
-	}
-
-	/**
-	 * Write supertaskinfo.
-	 *
-	 * @param supertaskInfoList the supertask info list
-	 * @return the instance specification
-	 */
-	public static InstanceSpecification writeSupertaskinfo(List<SupertaskInfo> supertaskInfoList) {
-		// save supertask info into the processor GaExecHost stereotype in
-		// otherSchedPolicy
-		SupertaskInfo s = (SupertaskInfo) supertaskInfoList.get(0);
-		InstanceSpecification processorInstance = s.getProcessorInstance();
-		for (Classifier classifier : processorInstance.getClassifiers()) {
-			GaExecHost proc = UMLUtils.getStereotypeApplication(classifier, GaExecHost.class);
-			if (proc != null) {
-
-				StringBuilder sb = new StringBuilder();
-				for (SupertaskInfo supertaskInfo : supertaskInfoList) {
-					sb.append(String.format("[%s=%s],", supertaskInfo.getName(), supertaskInfo.getCapacity()));
-				}
-				// remove last comma
-				sb.setLength(sb.length() - 1);
-
-				String schedPolicy = String.format("RUN(%s)", sb.toString());
-				proc.setOtherSchedPolicy(schedPolicy);
-			}
-		}
-		return processorInstance;
-	}
-
-	/**
-	 * Builds the task 2 core associations.
-	 *
-	 * @param hwSystem the hw system
-	 * @param result the result
-	 */
-	public static void buildTask2CoreAssociations(Component hwSystem, Map<CHCore, LinkedHashSet<Object>> result) {
-
-		for (CHCore core : result.keySet()) {
-			for (Object o : result.get(core)) {
-				if (!(o instanceof CHTask))
-					continue;
-
-				CHTask t = (CHTask) o;
-				Comment c = hwSystem.createOwnedComment();
-				UMLUtils.applyStereotype(c, MARTE_ASSIGN);
-				Assign assign = UMLUtils.getStereotypeApplication(c, Assign.class);
-				assign.getFrom().add(t.getSlot().getBase_Slot());
-				assign.getTo().add(core.getProcessorInstance());
-
-				eraseProcessorInfo(core.getProcessorInstance());
-
-				{
-					Constraint n = hwSystem.createOwnedRule(core.getName());
-					UMLUtils.applyStereotype(n, MARTE_NFPCONSTRAINT);
-					NfpConstraint rule = UMLUtils.getStereotypeApplication(n, NfpConstraint.class);
-
-					ValueSpecification valueSpec = n.createSpecification("core", null, UMLPackage.Literals.LITERAL_STRING);
-					LiteralString value = (LiteralString) valueSpec;
-					value.setValue(core.getName());
-					assign.getImpliedConstraint().add(rule);
-				}
-
-				{
-					String context = t.getCHRtSpecification().getContext().getName();
-					Constraint n = hwSystem.createOwnedRule(context);
-					UMLUtils.applyStereotype(n, MARTE_NFPCONSTRAINT);
-					NfpConstraint rule = UMLUtils.getStereotypeApplication(n, NfpConstraint.class);
-
-					ValueSpecification valueSpec = n.createSpecification("context", null, UMLPackage.Literals.LITERAL_STRING);
-					LiteralString value = (LiteralString) valueSpec;
-					value.setValue(context);
-					assign.getImpliedConstraint().add(rule);
-				}
-
-			}
-		}
-	}
-
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+/*------------------------------------------------------------------------------

+  -

+  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 

+  - All rights reserved. This program and the accompanying materials

+  - are made available under the terms of the Eclipse Public License v2.0

+  - which accompanies this distribution, and is available at

+  - http://www.eclipse.org/legal/epl-v20.html

+  -

+  - Contributors:

+  -

+  - Alessandro Zovi azovi@math.unipd.it

+  - Stefano Puri stefano.puri@intecs.it

+  - Laura Baracchi laura.baracchi@intecs.it

+  - Nicholas Pacini nicholas.pacini@intecs.it  

+  -

+  - Initial API and implementation and/or initial documentation

+  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.utils;

+

+import java.util.HashMap;

+import java.util.LinkedHashSet;

+import java.util.List;

+import java.util.Map;

+

+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaExecHost;

+import org.eclipse.emf.common.util.BasicEList;

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Assign;

+import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpConstraint;

+import org.eclipse.uml2.uml.Classifier;

+import org.eclipse.uml2.uml.Comment;

+import org.eclipse.uml2.uml.Component;

+import org.eclipse.uml2.uml.Constraint;

+import org.eclipse.uml2.uml.InstanceSpecification;

+import org.eclipse.uml2.uml.LiteralString;

+import org.eclipse.uml2.uml.UMLPackage;

+import org.eclipse.uml2.uml.ValueSpecification;

+import org.polarsys.chess.core.util.uml.UMLUtils;

+import org.polarsys.chess.multicore.model.CHCore;

+import org.polarsys.chess.multicore.model.CHTask;

+import org.polarsys.chess.multicore.model.SupertaskInfo;

+

+/**

+ * The Class GeneratorUtils.

+ */

+public class GeneratorUtils {

+

+	/** The Constant MARTE_ASSIGN. */

+	private static final String MARTE_ASSIGN = "MARTE::MARTE_Foundations::Alloc::Assign";

+	

+	/** The Constant MARTE_NFPCONSTRAINT. */

+	private static final String MARTE_NFPCONSTRAINT = "MARTE::MARTE_Foundations::NFPs::NfpConstraint";

+

+	/*

+	 * public static void buildTask2CoreAssociations(Component hwSystem,

+	 * EList<InstanceSpecification> processors, Map<CHCore, Set<CHTask>>

+	 * coresToCHTask) { for (CHCore core : coresToCHTask.keySet()) { for (CHTask o

+	 * : coresToCHTask.get(core)) {

+	 * 

+	 * Comment c = hwSystem.createOwnedComment(); UMLUtils.applyStereotype(c,

+	 * MARTE_ASSIGN); Assign assign = UMLUtils.getStereotypeApplication(c,

+	 * Assign.class);

+	 * 

+	 * assign.getFrom().add(o.getSlot().getBase_Slot());

+	 * assign.getTo().add(core.getProcessorInstance());

+	 * 

+	 * Constraint n = hwSystem.createOwnedRule(core.getName());

+	 * UMLUtils.applyStereotype(n, MARTE_NFPCONSTRAINT); NfpConstraint rule =

+	 * UMLUtils.getStereotypeApplication(n, NfpConstraint.class);

+	 * 

+	 * ValueSpecification valueSpec = n.createSpecification("core", null,

+	 * UMLPackage.Literals.LITERAL_STRING); LiteralString value = (LiteralString)

+	 * valueSpec; value.setValue(core.getName());

+	 * assign.getImpliedConstraint().add(rule);

+	 * 

+	 * } } }

+	 */

+

+	/**

+	 * Builds the task 2 super task associations.

+	 *

+	 * @param hwSystem the hw system

+	 * @param core2supertask the core 2 supertask

+	 * @param supertaskInfoList the supertask info list

+	 */

+	public static void buildTask2SuperTaskAssociations(Component hwSystem, HashMap<SupertaskInfo, LinkedHashSet<Object>> core2supertask, List<SupertaskInfo> supertaskInfoList) {

+

+		writeSupertaskinfo(supertaskInfoList);

+

+		for (SupertaskInfo supertask : core2supertask.keySet()) {

+			for (Object o : core2supertask.get(supertask)) {

+				if (!(o instanceof CHTask))

+					continue;

+

+				CHTask t = (CHTask) o;

+				Comment c = hwSystem.createOwnedComment();

+				UMLUtils.applyStereotype(c, MARTE_ASSIGN);

+				Assign assign = UMLUtils.getStereotypeApplication(c, Assign.class);

+				assign.getFrom().add(t.getSlot().getBase_Slot());

+				assign.getTo().add(supertask.getProcessorInstance());

+

+				{

+					Constraint n = hwSystem.createOwnedRule(supertask.getName());

+					UMLUtils.applyStereotype(n, MARTE_NFPCONSTRAINT);

+					NfpConstraint rule = UMLUtils.getStereotypeApplication(n, NfpConstraint.class);

+

+					ValueSpecification valueSpec = n.createSpecification("supertask", null, UMLPackage.Literals.LITERAL_STRING);

+					LiteralString value = (LiteralString) valueSpec;

+					value.setValue(supertask.getName());

+					assign.getImpliedConstraint().add(rule);

+				}

+

+				{

+					String context = t.getCHRtSpecification().getContext().getName();

+					Constraint n = hwSystem.createOwnedRule(context);

+					UMLUtils.applyStereotype(n, MARTE_NFPCONSTRAINT);

+					NfpConstraint rule = UMLUtils.getStereotypeApplication(n, NfpConstraint.class);

+

+					ValueSpecification valueSpec = n.createSpecification("context", null, UMLPackage.Literals.LITERAL_STRING);

+					LiteralString value = (LiteralString) valueSpec;

+					value.setValue(context);

+					assign.getImpliedConstraint().add(rule);

+				}

+

+			}

+		}

+	}

+

+	/**

+	 * Erase processor info.

+	 *

+	 * @param processorInstance the processor instance

+	 */

+	public static void eraseProcessorInfo(InstanceSpecification processorInstance) {

+		for (Classifier classifier : processorInstance.getClassifiers()) {

+			GaExecHost proc = UMLUtils.getStereotypeApplication(classifier, GaExecHost.class);

+			if (proc != null) {

+				proc.setOtherSchedPolicy("");

+			}

+		}

+	}

+

+	/**

+	 * Write supertaskinfo.

+	 *

+	 * @param supertaskInfoList the supertask info list

+	 * @return the instance specification

+	 */

+	public static InstanceSpecification writeSupertaskinfo(List<SupertaskInfo> supertaskInfoList) {

+		// save supertask info into the processor GaExecHost stereotype in

+		// otherSchedPolicy

+		SupertaskInfo s = (SupertaskInfo) supertaskInfoList.get(0);

+		InstanceSpecification processorInstance = s.getProcessorInstance();

+		for (Classifier classifier : processorInstance.getClassifiers()) {

+			GaExecHost proc = UMLUtils.getStereotypeApplication(classifier, GaExecHost.class);

+			if (proc != null) {

+

+				StringBuilder sb = new StringBuilder();

+				for (SupertaskInfo supertaskInfo : supertaskInfoList) {

+					sb.append(String.format("[%s=%s],", supertaskInfo.getName(), supertaskInfo.getCapacity()));

+				}

+				// remove last comma

+				sb.setLength(sb.length() - 1);

+

+				String schedPolicy = String.format("RUN(%s)", sb.toString());

+				proc.setOtherSchedPolicy(schedPolicy);

+			}

+		}

+		return processorInstance;

+	}

+

+	/**

+	 * Builds the task 2 core associations.

+	 *

+	 * @param hwSystem the hw system

+	 * @param result the result

+	 */

+	public static void buildTask2CoreAssociations(Component hwSystem, Map<CHCore, LinkedHashSet<Object>> result) {

+

+		for (CHCore core : result.keySet()) {

+			for (Object o : result.get(core)) {

+				if (!(o instanceof CHTask))

+					continue;

+

+				CHTask t = (CHTask) o;

+				Comment c = hwSystem.createOwnedComment();

+				UMLUtils.applyStereotype(c, MARTE_ASSIGN);

+				Assign assign = UMLUtils.getStereotypeApplication(c, Assign.class);

+				assign.getFrom().add(t.getSlot().getBase_Slot());

+				assign.getTo().add(core.getProcessorInstance());

+

+				eraseProcessorInfo(core.getProcessorInstance());

+

+				{

+					Constraint n = hwSystem.createOwnedRule(core.getName());

+					UMLUtils.applyStereotype(n, MARTE_NFPCONSTRAINT);

+					NfpConstraint rule = UMLUtils.getStereotypeApplication(n, NfpConstraint.class);

+

+					ValueSpecification valueSpec = n.createSpecification("core", null, UMLPackage.Literals.LITERAL_STRING);

+					LiteralString value = (LiteralString) valueSpec;

+					value.setValue(core.getName());

+					assign.getImpliedConstraint().add(rule);

+				}

+

+				{

+					String context = t.getCHRtSpecification().getContext().getName();

+					Constraint n = hwSystem.createOwnedRule(context);

+					UMLUtils.applyStereotype(n, MARTE_NFPCONSTRAINT);

+					NfpConstraint rule = UMLUtils.getStereotypeApplication(n, NfpConstraint.class);

+

+					ValueSpecification valueSpec = n.createSpecification("context", null, UMLPackage.Literals.LITERAL_STRING);

+					LiteralString value = (LiteralString) valueSpec;

+					value.setValue(context);

+					assign.getImpliedConstraint().add(rule);

+				}

+

+			}

+		}

+	}

+

+}

diff --git a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/utils/InstanceQuery.java b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/utils/InstanceQuery.java
index cebbde0..d16ea7c 100644
--- a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/utils/InstanceQuery.java
+++ b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/utils/InstanceQuery.java
@@ -1,378 +1,385 @@
-/*------------------------------------------------------------------------------
-  -
-  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 
-  - 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:
-  -
-  - Alessandro Zovi azovi@math.unipd.it
-  - Stefano Puri stefano.puri@intecs.it
-  - Laura Baracchi laura.baracchi@intecs.it
-  - Nicholas Pacini nicholas.pacini@intecs.it  
-  -
-  - Initial API and implementation and/or initial documentation
-  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.utils;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.uml2.uml.Activity;
-import org.eclipse.uml2.uml.ActivityNode;
-import org.eclipse.uml2.uml.BehavioralFeature;
-import org.eclipse.uml2.uml.CallOperationAction;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.uml2.uml.Connector;
-import org.eclipse.uml2.uml.ConnectorEnd;
-import org.eclipse.uml2.uml.Constraint;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.uml2.uml.InstanceValue;
-import org.eclipse.uml2.uml.Model;
-import org.eclipse.uml2.uml.Operation;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.Slot;
-import org.polarsys.chess.chessmlprofile.Core.IdentifSlot;
-import org.polarsys.chess.chessmlprofile.Predictability.RTComponentModel.CHRtPortSlot;
-import org.polarsys.chess.chessmlprofile.Predictability.RTComponentModel.CHRtSpecification;
-import org.polarsys.chess.core.profiles.CHESSProfileManager;
-import org.polarsys.chess.core.util.uml.ModelError;
-import org.polarsys.chess.core.util.uml.UMLUtils;
-
-/**
- * The Class InstanceQuery.
- */
-public class InstanceQuery {
-
-	/**
-	 * Gets the instance spec package.
-	 *
-	 * @param umlModel the uml model
-	 * @return the instance spec package
-	 */
-	public static Package getInstanceSpecPackage(Model umlModel){
-		Package cmpv = CHESSProfileManager.getViewByStereotype(
-				(Model) umlModel, CHESSProfileManager.COMPONENT_VIEW);
-		cmpv = QueryUtils.getOneResourcePlatformPackage(cmpv);
-		return cmpv;
-	}
-
-	
-	
-
-	
-	
-	/**
-	 * Checks if is deferred.
-	 *
-	 * @param usedCH the used CH
-	 * @return true, if is deferred
-	 */
-	static boolean isDeferred(CHRtSpecification usedCH) {
-		String occKind = usedCH.getOccKind();
-		return occKind!=null;
-	}
-
-	/**
-	 * Gets the CH from slot.
-	 *
-	 * @param usedPiSlot the used pi slot
-	 * @param operation the operation
-	 * @return the CH from slot
-	 */
-	static CHRtSpecification getCHFromSlot(Slot usedPiSlot,
-			Operation operation) {
-		if(usedPiSlot == null){
-			return null;
-		}
-		CHRtPortSlot ch = UMLUtils.getStereotypeApplication(usedPiSlot, CHRtPortSlot.class);
-		if(ch==null)
-			return null;
-		
-		for (CHRtSpecification i : ch.getCH_RtSpecification()) {
-			if (i.getContext().equals(operation)) {
-				return i;
-			}
-			if(UMLUtils.areOperationsEqual((Operation) i.getContext(), operation, null)){
-				return i;
-			}
-		}
-		assert false;
-		return null;
-	}
-	
-	
-	/**
-	 * Gets the ri pi links.
-	 *
-	 * @param slot the slot
-	 * @return the ri pi links
-	 */
-	private static EList<InstanceSpecification> getRiPiLinks(Slot slot){
-		EList<InstanceSpecification> riPiLinks = new BasicEList<InstanceSpecification>();
-		EList<Element> allOwnedElements = slot.getOwner().getOwner().allOwnedElements();
-		for (Element e : allOwnedElements) {
-			if (e instanceof InstanceSpecification) {
-				InstanceSpecification f = (InstanceSpecification) e;
-				boolean b = f.getClassifiers().size() == 0;
-				if(b){
-					riPiLinks.add(f);
-				}
-			}
-		} 
-		return riPiLinks;
-	}
-
-	/**
-	 * Gets the opposite slot.
-	 *
-	 * @param slot the slot
-	 * @return the opposite slot
-	 * @throws ModelError the model error
-	 */
-	/*identical of getCorrespondingSLot of QVTO transformation*/
-	static Slot getOppositeSlot(Slot slot) throws ModelError {
-		EList<InstanceSpecification> riPiLinks = getRiPiLinks(slot);
-		
-		for (InstanceSpecification l : riPiLinks) {
-			EList<InstanceValue> ends = getEnds(l);
-			
-			if(ends.size()!=2) throw new ModelError("A connector must have exactly 2 ends");
-			
-			for (int i = 0; i < 2; i++) {
-				//1st step: i=0 j=1
-				//2nd step: i=1 j=0
-				int j = (i+1)%2;
-				InstanceValue first = ends.get(i);
-				boolean b = first.getInstance().equals(slot.getOwningInstance());
-				b = b && ((Slot)first.getOwner()).getDefiningFeature().equals(slot.getDefiningFeature());
-				
-				if(b){
-					InstanceValue instanceValue = ends.get(j);
-					InstanceSpecification instance = instanceValue.getInstance();
-					
-					Element owner = instanceValue.getOwner();
-					if (owner instanceof Slot) {
-						Slot sOwner = (Slot) owner;
-						
-						for (Slot s : instance.getSlots()) {
-							 
-							if(s.getDefiningFeature().equals(sOwner.getDefiningFeature()))
-								return s;
-							
-						}
-					}
-					
-				}
-			}
-
-			/*checkingIV = ends.get(1);
-			b = checkingIV.getInstance().equals(slot.getOwningInstance());
-			b = b && ((Slot)checkingIV.getOwner()).getDefiningFeature().equals(slot.getDefiningFeature());
-			
-			if(b){
-				InstanceSpecification instance = ends.get(0).getInstance();
-				for (Slot s : instance.getSlots()) {
-					if(s.getDefiningFeature().equals(((Slot)s.getOwner()).getDefiningFeature()))
-						return s;
-				}
-			}*/
-		}
-		
-		return null;
-	}
-
-
-	/**
-	 * Gets the ends.
-	 *
-	 * @param l the l
-	 * @return the ends
-	 */
-	private static EList<InstanceValue> getEnds(InstanceSpecification l) {
-		EList<InstanceValue> ends = new BasicEList<InstanceValue>();
-
-		for (Element element : l.allOwnedElements()) {
-			if (element instanceof InstanceValue) {
-				InstanceValue iv = (InstanceValue) element;
-				 ends.add(iv);
-				 
-			}
-		}
-		return ends;
-	}
-
-	/**
-	 * Gets the slot from port.
-	 *
-	 * @param callOp the call op
-	 * @param owningInstance the owning instance
-	 * @return the slot from port
-	 */
-	static EList<Slot> getSlotFromPort(CallOperationAction callOp,
-			InstanceSpecification owningInstance) {
-		BehavioralFeature specification = callOp.getActivity().getSpecification();
-		Operation op = (Operation)specification;
-		Constraint c = null;
-		for (Constraint rule : op.getClass_().getOwnedRules()) {
-			for (Element cE :rule.getConstrainedElements()) {
-				if (cE instanceof CallOperationAction) {
-					CallOperationAction cCE = (CallOperationAction) cE;
-					if(cCE.equals(callOp))
-						c = rule;
-						break;
-				}
-			}
-		}
-		EList<Slot> result = new BasicEList<Slot>();
-		if(c==null){
-			for (Slot slot : owningInstance.getSlots()) {
-				if(slot.getDefiningFeature().equals(callOp.getOnPort())){
-					result.add(slot);
-				}
-			}
-		} else {
-			result = portToSlotsByRule(owningInstance, callOp.getOnPort(), c);
-		}
-		return result;
-	}
-	
-	
-
-	/**
-	 * Gets the CH rt port slot.
-	 *
-	 * @param instPkg the inst pkg
-	 * @param dOp the d op
-	 * @return the CH rt port slot
-	 * @throws ModelError the model error
-	 */
-	static CHRtPortSlot getCHRtPortSlot(Package instPkg, CHRtSpecification dOp) throws ModelError {
-		for (Element e : instPkg.allOwnedElements()) {
-			if(!(e instanceof Slot))
-				continue;
-			CHRtPortSlot pSlot = UMLUtils.getStereotypeApplication(e, CHRtPortSlot.class);
-			if(pSlot==null)
-				continue;
-			for (CHRtSpecification chSPec : pSlot.getCH_RtSpecification()) {
-				if(chSPec.equals(dOp)){
-					return pSlot;
-				}
-			}
-		}
-		throw new ModelError("Slot for %s does not exist in the instance package", dOp.getContext().getName());
-	}
-
-	/**
-	 * Gets the CH rt commentsfrom port.
-	 *
-	 * @param piPort the pi port
-	 * @param operation the operation
-	 * @return the CH rt commentsfrom port
-	 */
-	private static void getCHRtCommentsfromPort(Port piPort, Operation operation) {
-		
-		EList<Comment> ownedComments = piPort.getOwner().getOwner().getOwnedComments();
-		for (Comment comment : ownedComments) {
-			CHRtSpecification stereotypeApplication = UMLUtils.getStereotypeApplication(comment, CHRtSpecification.class);
-			if(stereotypeApplication !=null){
-				Operation context = (Operation) stereotypeApplication.getContext();
-				UMLUtils.isOperationEquals(context, operation);
-			}
-		}
-	}
-
-	/**
-	 * Gets the opposite port.
-	 *
-	 * @param riPort the ri port
-	 * @return the opposite port
-	 */
-	private static Port getOppositePort(Port riPort) {
-		EList<ConnectorEnd> ends = riPort.getEnds();
-		assert(ends.size()==1);
-		for (ConnectorEnd end : ends) {
-			Connector connector = (Connector)end.getOwner();
-			ConnectorEnd oppositeEnd = getOppositeEnd(connector, end);
-			Port oppositePort = (Port)oppositeEnd.getRole();
-			return oppositePort;
-		}
-		return null;
-	}
-
-	/**
-	 * Gets the opposite end.
-	 *
-	 * @param connector the connector
-	 * @param currentEnd the current end
-	 * @return the opposite end
-	 */
-	private static ConnectorEnd getOppositeEnd(Connector connector, ConnectorEnd currentEnd) {
-		EList<ConnectorEnd> array = connector.getEnds();
-		assert(array.size()==2);
-		
-		for (ConnectorEnd end : array) {
-			if(!end.equals(currentEnd))
-				return (ConnectorEnd) end;
-		}
-		
-		return null;
-	}
-
-	/**
-	 * Gets the method.
-	 *
-	 * @param dOp the d op
-	 * @return the method
-	 */
-	static Activity getMethod(CHRtSpecification dOp) {
-		try {
-			return (Activity) dOp.getContext().getMethods().get(0);
-		} catch (Exception e) {
-		}
-		return null;
-	}
-	
-	
-
-	
-	/**
-	 * Port to slots by rule.
-	 *
-	 * @param self the self
-	 * @param onPort the on port
-	 * @param rule the rule
-	 * @return the e list
-	 */
-	private static EList<Slot> portToSlotsByRule(InstanceSpecification self, Port onPort, Constraint rule) {
-		EList<Slot> list = new BasicEList<Slot>();
-		
-		String values[] = rule.getSpecification().stringValue().trim().split(" ");
-		ArrayList<int[]> boundsList = new ArrayList<int[]>();
-		for (String value : values) {
-			boundsList.add(VSLUtils.getBounds(value));
-		}
-		
-		for (Slot slot : self.getSlots()) {
-			IdentifSlot id = UMLUtils.getStereotypeApplication(slot, IdentifSlot.class);
-			
-			if (id != null && slot.getDefiningFeature() == onPort && VSLUtils.isInBounds(id.getId(), boundsList)) {
-				list.add(slot);
-			}
-			else if (slot.getDefiningFeature() == onPort) {
-				list.add(slot);
-			}
-		}
-		
-		return list;
-	}
-
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+/*------------------------------------------------------------------------------

+  -

+  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 

+  - All rights reserved. This program and the accompanying materials

+  - are made available under the terms of the Eclipse Public License v2.0

+  - which accompanies this distribution, and is available at

+  - http://www.eclipse.org/legal/epl-v20.html

+  -

+  - Contributors:

+  -

+  - Alessandro Zovi azovi@math.unipd.it

+  - Stefano Puri stefano.puri@intecs.it

+  - Laura Baracchi laura.baracchi@intecs.it

+  - Nicholas Pacini nicholas.pacini@intecs.it  

+  -

+  - Initial API and implementation and/or initial documentation

+  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.utils;

+

+import java.util.ArrayList;

+import java.util.HashMap;

+import java.util.Set;

+import java.util.regex.Matcher;

+import java.util.regex.Pattern;

+

+import org.eclipse.emf.common.util.BasicEList;

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.uml2.uml.Activity;

+import org.eclipse.uml2.uml.ActivityNode;

+import org.eclipse.uml2.uml.BehavioralFeature;

+import org.eclipse.uml2.uml.CallOperationAction;

+import org.eclipse.uml2.uml.Comment;

+import org.eclipse.uml2.uml.Connector;

+import org.eclipse.uml2.uml.ConnectorEnd;

+import org.eclipse.uml2.uml.Constraint;

+import org.eclipse.uml2.uml.Element;

+import org.eclipse.uml2.uml.InstanceSpecification;

+import org.eclipse.uml2.uml.InstanceValue;

+import org.eclipse.uml2.uml.Model;

+import org.eclipse.uml2.uml.Operation;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.Port;

+import org.eclipse.uml2.uml.Slot;

+import org.polarsys.chess.chessmlprofile.Core.IdentifSlot;

+import org.polarsys.chess.chessmlprofile.Predictability.RTComponentModel.CHRtPortSlot;

+import org.polarsys.chess.chessmlprofile.Predictability.RTComponentModel.CHRtSpecification;

+import org.polarsys.chess.core.profiles.CHESSProfileManager;

+import org.polarsys.chess.core.util.uml.ModelError;

+import org.polarsys.chess.core.util.uml.UMLUtils;

+

+/**

+ * The Class InstanceQuery.

+ */

+public class InstanceQuery {

+

+	/**

+	 * Gets the instance spec package.

+	 *

+	 * @param umlModel the uml model

+	 * @return the instance spec package

+	 */

+	public static Package getInstanceSpecPackage(Model umlModel){

+		Package cmpv = CHESSProfileManager.getViewByStereotype(

+				(Model) umlModel, CHESSProfileManager.COMPONENT_VIEW);

+		cmpv = QueryUtils.getOneResourcePlatformPackage(cmpv);

+		return cmpv;

+	}

+

+	

+	

+

+	

+	

+	/**

+	 * Checks if is deferred.

+	 *

+	 * @param usedCH the used CH

+	 * @return true, if is deferred

+	 */

+	static boolean isDeferred(CHRtSpecification usedCH) {

+		String occKind = usedCH.getOccKind();

+		return occKind!=null;

+	}

+

+	/**

+	 * Gets the CH from slot.

+	 *

+	 * @param usedPiSlot the used pi slot

+	 * @param operation the operation

+	 * @return the CH from slot

+	 */

+	static CHRtSpecification getCHFromSlot(Slot usedPiSlot,

+			Operation operation) {

+		if(usedPiSlot == null){

+			return null;

+		}

+		CHRtPortSlot ch = UMLUtils.getStereotypeApplication(usedPiSlot, CHRtPortSlot.class);

+		if(ch==null)

+			return null;

+		

+		for (CHRtSpecification i : ch.getCH_RtSpecification()) {

+			if (i.getContext().equals(operation)) {

+				return i;

+			}

+			if(UMLUtils.areOperationsEqual((Operation) i.getContext(), operation, null)){

+				return i;

+			}

+		}

+		assert false;

+		return null;

+	}

+	

+	

+	/**

+	 * Gets the ri pi links.

+	 *

+	 * @param slot the slot

+	 * @return the ri pi links

+	 */

+	private static EList<InstanceSpecification> getRiPiLinks(Slot slot){

+		EList<InstanceSpecification> riPiLinks = new BasicEList<InstanceSpecification>();

+		EList<Element> allOwnedElements = slot.getOwner().getOwner().allOwnedElements();

+		for (Element e : allOwnedElements) {

+			if (e instanceof InstanceSpecification) {

+				InstanceSpecification f = (InstanceSpecification) e;

+				boolean b = f.getClassifiers().size() == 0;

+				if(b){

+					riPiLinks.add(f);

+				}

+			}

+		} 

+		return riPiLinks;

+	}

+

+	/**

+	 * Gets the opposite slot.

+	 *

+	 * @param slot the slot

+	 * @return the opposite slot

+	 * @throws ModelError the model error

+	 */

+	/*identical of getCorrespondingSLot of QVTO transformation*/

+	static Slot getOppositeSlot(Slot slot) throws ModelError {

+		EList<InstanceSpecification> riPiLinks = getRiPiLinks(slot);

+		

+		for (InstanceSpecification l : riPiLinks) {

+			EList<InstanceValue> ends = getEnds(l);

+			

+			if(ends.size()!=2) throw new ModelError("A connector must have exactly 2 ends");

+			

+			for (int i = 0; i < 2; i++) {

+				//1st step: i=0 j=1

+				//2nd step: i=1 j=0

+				int j = (i+1)%2;

+				InstanceValue first = ends.get(i);

+				boolean b = first.getInstance().equals(slot.getOwningInstance());

+				b = b && ((Slot)first.getOwner()).getDefiningFeature().equals(slot.getDefiningFeature());

+				

+				if(b){

+					InstanceValue instanceValue = ends.get(j);

+					InstanceSpecification instance = instanceValue.getInstance();

+					

+					Element owner = instanceValue.getOwner();

+					if (owner instanceof Slot) {

+						Slot sOwner = (Slot) owner;

+						

+						for (Slot s : instance.getSlots()) {

+							 

+							if(s.getDefiningFeature().equals(sOwner.getDefiningFeature()))

+								return s;

+							

+						}

+					}

+					

+				}

+			}

+

+			/*checkingIV = ends.get(1);

+			b = checkingIV.getInstance().equals(slot.getOwningInstance());

+			b = b && ((Slot)checkingIV.getOwner()).getDefiningFeature().equals(slot.getDefiningFeature());

+			

+			if(b){

+				InstanceSpecification instance = ends.get(0).getInstance();

+				for (Slot s : instance.getSlots()) {

+					if(s.getDefiningFeature().equals(((Slot)s.getOwner()).getDefiningFeature()))

+						return s;

+				}

+			}*/

+		}

+		

+		return null;

+	}

+

+

+	/**

+	 * Gets the ends.

+	 *

+	 * @param l the l

+	 * @return the ends

+	 */

+	private static EList<InstanceValue> getEnds(InstanceSpecification l) {

+		EList<InstanceValue> ends = new BasicEList<InstanceValue>();

+

+		for (Element element : l.allOwnedElements()) {

+			if (element instanceof InstanceValue) {

+				InstanceValue iv = (InstanceValue) element;

+				 ends.add(iv);

+				 

+			}

+		}

+		return ends;

+	}

+

+	/**

+	 * Gets the slot from port.

+	 *

+	 * @param callOp the call op

+	 * @param owningInstance the owning instance

+	 * @return the slot from port

+	 */

+	static EList<Slot> getSlotFromPort(CallOperationAction callOp,

+			InstanceSpecification owningInstance) {

+		BehavioralFeature specification = callOp.getActivity().getSpecification();

+		Operation op = (Operation)specification;

+		Constraint c = null;

+		for (Constraint rule : op.getClass_().getOwnedRules()) {

+			for (Element cE :rule.getConstrainedElements()) {

+				if (cE instanceof CallOperationAction) {

+					CallOperationAction cCE = (CallOperationAction) cE;

+					if(cCE.equals(callOp))

+						c = rule;

+						break;

+				}

+			}

+		}

+		EList<Slot> result = new BasicEList<Slot>();

+		if(c==null){

+			for (Slot slot : owningInstance.getSlots()) {

+				if(slot.getDefiningFeature().equals(callOp.getOnPort())){

+					result.add(slot);

+				}

+			}

+		} else {

+			result = portToSlotsByRule(owningInstance, callOp.getOnPort(), c);

+		}

+		return result;

+	}

+	

+	

+

+	/**

+	 * Gets the CH rt port slot.

+	 *

+	 * @param instPkg the inst pkg

+	 * @param dOp the d op

+	 * @return the CH rt port slot

+	 * @throws ModelError the model error

+	 */

+	static CHRtPortSlot getCHRtPortSlot(Package instPkg, CHRtSpecification dOp) throws ModelError {

+		for (Element e : instPkg.allOwnedElements()) {

+			if(!(e instanceof Slot))

+				continue;

+			CHRtPortSlot pSlot = UMLUtils.getStereotypeApplication(e, CHRtPortSlot.class);

+			if(pSlot==null)

+				continue;

+			for (CHRtSpecification chSPec : pSlot.getCH_RtSpecification()) {

+				if(chSPec.equals(dOp)){

+					return pSlot;

+				}

+			}

+		}

+		throw new ModelError("Slot for %s does not exist in the instance package", dOp.getContext().getName());

+	}

+

+	/**

+	 * Gets the CH rt commentsfrom port.

+	 *

+	 * @param piPort the pi port

+	 * @param operation the operation

+	 * @return the CH rt commentsfrom port

+	 */

+	private static void getCHRtCommentsfromPort(Port piPort, Operation operation) {

+		

+		EList<Comment> ownedComments = piPort.getOwner().getOwner().getOwnedComments();

+		for (Comment comment : ownedComments) {

+			CHRtSpecification stereotypeApplication = UMLUtils.getStereotypeApplication(comment, CHRtSpecification.class);

+			if(stereotypeApplication !=null){

+				Operation context = (Operation) stereotypeApplication.getContext();

+				UMLUtils.isOperationEquals(context, operation);

+			}

+		}

+	}

+

+	/**

+	 * Gets the opposite port.

+	 *

+	 * @param riPort the ri port

+	 * @return the opposite port

+	 */

+	private static Port getOppositePort(Port riPort) {

+		EList<ConnectorEnd> ends = riPort.getEnds();

+		assert(ends.size()==1);

+		for (ConnectorEnd end : ends) {

+			Connector connector = (Connector)end.getOwner();

+			ConnectorEnd oppositeEnd = getOppositeEnd(connector, end);

+			Port oppositePort = (Port)oppositeEnd.getRole();

+			return oppositePort;

+		}

+		return null;

+	}

+

+	/**

+	 * Gets the opposite end.

+	 *

+	 * @param connector the connector

+	 * @param currentEnd the current end

+	 * @return the opposite end

+	 */

+	private static ConnectorEnd getOppositeEnd(Connector connector, ConnectorEnd currentEnd) {

+		EList<ConnectorEnd> array = connector.getEnds();

+		assert(array.size()==2);

+		

+		for (ConnectorEnd end : array) {

+			if(!end.equals(currentEnd))

+				return (ConnectorEnd) end;

+		}

+		

+		return null;

+	}

+

+	/**

+	 * Gets the method.

+	 *

+	 * @param dOp the d op

+	 * @return the method

+	 */

+	static Activity getMethod(CHRtSpecification dOp) {

+		try {

+			return (Activity) dOp.getContext().getMethods().get(0);

+		} catch (Exception e) {

+		}

+		return null;

+	}

+	

+	

+

+	

+	/**

+	 * Port to slots by rule.

+	 *

+	 * @param self the self

+	 * @param onPort the on port

+	 * @param rule the rule

+	 * @return the e list

+	 */

+	private static EList<Slot> portToSlotsByRule(InstanceSpecification self, Port onPort, Constraint rule) {

+		EList<Slot> list = new BasicEList<Slot>();

+		

+		String values[] = rule.getSpecification().stringValue().trim().split(" ");

+		ArrayList<int[]> boundsList = new ArrayList<int[]>();

+		for (String value : values) {

+			boundsList.add(VSLUtils.getBounds(value));

+		}

+		

+		for (Slot slot : self.getSlots()) {

+			IdentifSlot id = UMLUtils.getStereotypeApplication(slot, IdentifSlot.class);

+			

+			if (id != null && slot.getDefiningFeature() == onPort && VSLUtils.isInBounds(id.getId(), boundsList)) {

+				list.add(slot);

+			}

+			else if (slot.getDefiningFeature() == onPort) {

+				list.add(slot);

+			}

+		}

+		

+		return list;

+	}

+

+}

diff --git a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/utils/QueryUtils.java b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/utils/QueryUtils.java
index 32d4d5d..dfe74ce 100644
--- a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/utils/QueryUtils.java
+++ b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/utils/QueryUtils.java
@@ -1,2216 +1,2223 @@
-/*------------------------------------------------------------------------------
-  -
-  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 
-  - 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:
-  -
-  - Alessandro Zovi azovi@math.unipd.it
-  - Stefano Puri stefano.puri@intecs.it
-  - Laura Baracchi laura.baracchi@intecs.it
-  - Nicholas Pacini nicholas.pacini@intecs.it  
-  -
-  - Initial API and implementation and/or initial documentation
-  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.utils;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.crypto.spec.OAEPParameterSpec;
-
-import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.Enumerator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.CallConcurrencyKind;
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevice;
-import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Assign;
-import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpConstraint;
-import org.eclipse.papyrus.uml.tools.model.UmlModel;
-import org.eclipse.uml2.uml.Activity;
-import org.eclipse.uml2.uml.ActivityNode;
-import org.eclipse.uml2.uml.CallOperationAction;
-import org.eclipse.uml2.uml.Classifier;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.uml2.uml.Component;
-import org.eclipse.uml2.uml.Constraint;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.uml2.uml.LiteralString;
-import org.eclipse.uml2.uml.Model;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Slot;
-import org.eclipse.uml2.uml.Stereotype;
-import org.eclipse.uml2.uml.UMLPackage;
-import org.eclipse.uml2.uml.ValueSpecification;
-import org.polarsys.chess.chessmlprofile.ComponentModel.ComponentImplementation;
-import org.polarsys.chess.chessmlprofile.ComponentModel.FunctionalPartition;
-import org.polarsys.chess.chessmlprofile.Core.CHESS;
-import org.polarsys.chess.chessmlprofile.Core.CHGaResourcePlatform;
-import org.polarsys.chess.chessmlprofile.Core.FunctionalPartitions;
-import org.polarsys.chess.chessmlprofile.Predictability.DeploymentConfiguration.HardwareBaseline.CH_HwProcessor;
-import org.polarsys.chess.chessmlprofile.Predictability.RTComponentModel.CHRtPortSlot;
-import org.polarsys.chess.chessmlprofile.Predictability.RTComponentModel.CHRtSpecification;
-import org.polarsys.chess.chessmlprofile.util.Constants;
-import org.polarsys.chess.core.profiles.CHESSProfileManager;
-import org.polarsys.chess.core.util.uml.ModelError;
-import org.polarsys.chess.core.util.uml.UMLUtils;
-import org.polarsys.chess.multicore.model.CHCore;
-import org.polarsys.chess.multicore.model.CHTask;
-import org.polarsys.chess.validator.constraints.StringParser;
-
-/**
- * The Class QueryUtils.
- */
-public class QueryUtils {
-	
-	/**
-	 * The Class OccKindInfo.
-	 */
-	public static class OccKindInfo {
-
-		/** The value. */
-		public double value;
-		
-		/** The type. */
-		public String type;
-		
-		/** The unit. */
-		public String unit;
-
-	}
-
-	/** The Constant MARTE_ASSIGN. */
-	private static final String MARTE_ASSIGN = "MARTE::MARTE_Foundations::Alloc::Assign";
-	
-	/** The Constant MARTE_NFPCONSTRAINT. */
-	private static final String MARTE_NFPCONSTRAINT = "MARTE::MARTE_Foundations::NFPs::NfpConstraint";
-
-	/** The Constant COMPONENT_TO_PARTITION. */
-	public static final int COMPONENT_TO_PARTITION = 0;
-	
-	/** The Constant PARTITION_TO_CORE. */
-	public static final int PARTITION_TO_CORE = 1;
-	
-	/** The Constant COMPONENT_TO_CORE. */
-	public static final int COMPONENT_TO_CORE = 2;
-	
-	/** The Constant TASK_TO_CORE. */
-	public static final int TASK_TO_CORE = 3;
-
-	/**
-	 * Gets the chess.
-	 *
-	 * @param umlModel the uml model
-	 * @return the chess
-	 */
-	public static CHESS getCHESS(Model umlModel) {
-		return UMLUtils.getStereotypeApplication(umlModel, CHESS.class);
-	}
-
-	/**
-	 * Gets the command stack.
-	 *
-	 * @param umlModel the uml model
-	 * @return the command stack
-	 */
-	public static CommandStack getCommandStack(Model umlModel) {
-		TransactionalEditingDomain editingDomain = TransactionUtil.getEditingDomain(umlModel);
-		return editingDomain.getCommandStack();
-	}
-
-	/**
-	 * returns the component which owns the assigns from components to partitions.
-	 *
-	 * @param umlModel the uml model
-	 * @return the partitions component
-	 * @throws ModelError the model error
-	 * @deprecated PartitionsComponent stereotype is deprecated
-	 */
-	public static Component getPartitionsComponent(Model umlModel) throws ModelError {
-		// assumption: assigns are stored in the root SW system i.e. the one
-		// stereotyped with CHGaResourcePlatform
-
-		CHESS chess = getCHESS(umlModel);
-		Package componentViewP = chess.getComponentView().getBase_Package();
-
-		for (Element el : componentViewP.allOwnedElements()) {
-			if (el instanceof Component) {
-				Component c = (Component) el;
-				// LB 20150707 Next line to be reviewed based on considerations about
-				// partitions' component
-				boolean b = c.getName().equalsIgnoreCase("Partitions");
-				b = b || UMLUtils.getStereotypeApplication(el, FunctionalPartitions.class) != null;
-				if (b)
-					return c;
-			}
-		}
-
-		throw new ModelError("Partitions component not found.");
-	}
-
-	
-	/**
-	 * Given a Partition returns the list of Components that are assigned to it.
-	 *
-	 * @param partition the partition
-	 * @param assignments the assignments
-	 * @return the components assigned 2 partition
-	 */
-	public static LinkedHashSet<Object> getComponentsAssigned2Partition(InstanceSpecification partition, EList<Assign> assignments) {
-		LinkedHashSet<Object> result = new LinkedHashSet<Object>();
-
-		for (Assign theAssignment : assignments) {
-			if (theAssignment != null) {
-				try {
-					if (theAssignment.getTo().contains((Object) partition) && (elementIsComponentInstance(theAssignment.getFrom().get(0)))) {
-						result.add(theAssignment.getFrom().get(0));
-					}
-				} catch (Exception e) {
-					// do nothing
-				}
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Deletes all the associations of the given type.
-	 *
-	 * @param parent the parent
-	 * @param associationType (PARTITION_TO_CORE | COMPONENT_TO_CORE | TASK_TO_CORE | COMPONENT_TO_PARTITION
-	 */
-	public static void deleteAssociations(Component parent, int associationType) {
-		for (Object el : parent.getOwnedComments().toArray()) {
-			if (el instanceof Comment) {
-				Comment assignComment = (Comment) el;
-
-				Assign assign = UMLUtils.getStereotypeApplication(assignComment, Assign.class);
-				// Only delete one kind of associations
-				try {
-					if ((assign != null && associationType == PARTITION_TO_CORE && (elementIsPartitionInstance(assign.getFrom().get(0))))
-							|| (assign != null && associationType == COMPONENT_TO_CORE && (elementIsComponentInstance(assign.getFrom().get(0))) && (elementIsProcessorInstance(assign.getTo().get(0))))
-							|| (assign != null && associationType == TASK_TO_CORE && (elementIsSlotInstance(assign.getFrom().get(0))) && (elementIsProcessorInstance(assign.getTo().get(0))))
-							|| (assign != null && associationType == COMPONENT_TO_PARTITION && (elementIsComponentInstance(assign.getFrom().get(0))) && (elementIsPartitionInstance(assign.getTo().get(0))))) {
-						if (assign != null && assign.getImpliedConstraint().size() > 0) {
-							for (Object c : assign.getImpliedConstraint().toArray()) {
-								if (c instanceof NfpConstraint) {
-									NfpConstraint n = (NfpConstraint) c;
-									n.getBase_Constraint().destroy();
-								}
-							}
-						}
-						assignComment.destroy();
-					}
-				} catch (Exception e) {
-					// 20160225 Always delete assignments where one end is null!
-					assignComment.destroy();
-				}
-			}
-		}
-
-		// for (Object el : parent.getOwnedRules().toArray()) {
-		// if (el instanceof Constraint) {
-		// Constraint assignComment = (Constraint) el;
-		// assignComment.destroy();
-		// }
-		// }
-	}
-
-	/**
-	 * Returns the CHTask associated to the given element (if this is a CHRTPortSlot).
-	 *
-	 * @param element the element
-	 * @return task that corresponds to the input slot, if any
-	 */
-	public static CHTask getTaskFromSlot(Element element) {
-		if (!(element instanceof Slot)) {
-			return null;
-		}
-		Slot slot = (Slot) element;
-		CHRtPortSlot chSlot = UMLUtils.getStereotypeApplication(slot, CHRtPortSlot.class);
-		if (chSlot == null) {
-			return null;
-		}
-		EList<CHRtSpecification> chSpecs = chSlot.getCH_RtSpecification();
-		for (CHRtSpecification chRtSpecification : chSpecs) {
-			String occKind = chRtSpecification.getOccKind();
-			if (occKind != null && isOccKindSporadicOrPeriodic(occKind)) {
-				return new CHTask(chSlot, chRtSpecification);
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns all the CHTasks associated to the given element (if this is a CHRTPortSlot).
-	 *
-	 * @param element the element
-	 * @return task that corresponds to the input slot, if any
-	 */
-	private static EList<CHTask> getAllTasksFromSlot(Element element) {
-		EList<CHTask> chTaskList = new BasicEList<CHTask>();
-		if (!(element instanceof Slot)) {
-			return chTaskList;
-		}
-		Slot slot = (Slot) element;
-		CHRtPortSlot chSlot = UMLUtils.getStereotypeApplication(slot, CHRtPortSlot.class);
-		if (chSlot == null) {
-			return chTaskList;
-		}
-		EList<CHRtSpecification> chSpecs = chSlot.getCH_RtSpecification();
-		for (CHRtSpecification chRtSpecification : chSpecs) {
-			String occKind = chRtSpecification.getOccKind();
-			if (occKind != null && isOccKindSporadicOrPeriodic(occKind)) {
-				chTaskList.add(new CHTask(chSlot, chRtSpecification));
-				// return new CHTask(chSlot, chRtSpecification);
-			}
-		}
-		return chTaskList;
-	}
-
-	/**
-	 * Element is slot instance.
-	 *
-	 * @param element the element
-	 * @return true, if successful
-	 */
-	public static boolean elementIsSlotInstance(Element element) {
-		return element instanceof Slot;
-	}
-
-	/**
-	 * Given a component, create all the Component to Partition Assignments.
-	 *
-	 * @param parent the parent
-	 * @param result the result
-	 */
-	public static void buildComponent2PartitionAssignment(Component parent, Map<InstanceSpecification, LinkedHashSet<Object>> result) {
-		System.out.println(parent.getQualifiedName());
-
-		for (InstanceSpecification partitionInst : result.keySet()) {
-			System.out.println(partitionInst.getName());
-			for (Object o : result.get(partitionInst)) {
-				if (o instanceof InstanceSpecification) {
-					InstanceSpecification componentInst = (InstanceSpecification) o;
-					System.out.println(componentInst.getName());
-
-					Comment c = parent.createOwnedComment();
-					UMLUtils.applyStereotype(c, MARTE_ASSIGN);
-					Assign assign = UMLUtils.getStereotypeApplication(c, Assign.class);
-					assign.getFrom().add(componentInst);
-					assign.getTo().add(partitionInst);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Builds the core name.
-	 *
-	 * @param coreNumber the core number
-	 * @return the string
-	 */
-	public static String buildCoreName(int coreNumber) {
-		/* coreNumber starts from 0 */
-		return "core" + coreNumber;
-	}
-
-	/**
-	 * Create all the Partition to Core Assignments.
-	 *
-	 * @param parent the parent
-	 * @param result the result
-	 */
-	public static void buildPartition2CoreAssignments(Component parent, Map<CHCore, LinkedHashSet<Object>> result) {
-		for (CHCore core : result.keySet()) {
-			for (Object o : result.get(core)) {
-				if (o instanceof InstanceSpecification) {
-					InstanceSpecification partitionInst = (InstanceSpecification) o;
-					Comment c = parent.createOwnedComment();
-					UMLUtils.applyStereotype(c, MARTE_ASSIGN);
-					Assign assign = UMLUtils.getStereotypeApplication(c, Assign.class);
-					assign.getFrom().add(partitionInst);
-					assign.getTo().add(core.getProcessorInstance());
-
-					Constraint n = parent.createOwnedRule(core.getName());
-					UMLUtils.applyStereotype(n, MARTE_NFPCONSTRAINT);
-					NfpConstraint rule = UMLUtils.getStereotypeApplication(n, NfpConstraint.class);
-
-					ValueSpecification valueSpec = n.createSpecification("core", null, UMLPackage.Literals.LITERAL_STRING);
-					LiteralString value = (LiteralString) valueSpec;
-					value.setValue(core.getName());
-					assign.getImpliedConstraint().add(rule);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Returns the first CHGaResourcePlatform that is found inside the given package.
-	 *
-	 * @param cmpv the cmpv
-	 * @return the one resource platform package
-	 */
-	public static Package getOneResourcePlatformPackage(Package cmpv) {
-		/* breath-first search */
-		final LinkedList<Package> breadthFirstList = new LinkedList<Package>();
-		breadthFirstList.addFirst(cmpv);
-		while (!breadthFirstList.isEmpty()) {
-			final Package candidate = breadthFirstList.poll();
-
-			CHGaResourcePlatform a = UMLUtils.getStereotypeApplication(candidate, CHGaResourcePlatform.class);
-
-			if (a != null)
-				return candidate;
-
-			for (final Package p : candidate.getNestedPackages()) {
-				breadthFirstList.addLast(p);
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Gets the resource platform package.
-	 *
-	 * @param cmpv the cmpv
-	 * @return the resource platform package
-	 * @deprecated This method returns only one platform package. In the newer
-	 *             version of CHESS there can be multiple platform packages.
-	 *             Replace with getResourcePlatformPackages
-	 */
-	@Deprecated
-	public static Package getResourcePlatformPackage(Package cmpv) {
-		/* breath-first search */
-		final LinkedList<Package> breadthFirstList = new LinkedList<Package>();
-		breadthFirstList.addFirst(cmpv);
-		while (!breadthFirstList.isEmpty()) {
-			final Package candidate = breadthFirstList.poll();
-
-			CHGaResourcePlatform a = UMLUtils.getStereotypeApplication(candidate, CHGaResourcePlatform.class);
-
-			if (a != null)
-				return candidate;
-
-			for (final Package p : candidate.getNestedPackages()) {
-				breadthFirstList.addLast(p);
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the list of CHGaResourcePlatforms found inside the view with the given name in the given model.
-	 *
-	 * @param umlModel the uml model
-	 * @param viewName the view name
-	 * @return the resource platform packages
-	 * @throws ModelError the model error
-	 */
-	public static EList<Package> getResourcePlatformPackages(Model umlModel, String viewName) throws ModelError {
-
-		Package pack = CHESSProfileManager.getViewByStereotype((Model) umlModel, viewName);
-
-		if (pack == null)
-			throw new ModelError(viewName + " not found.");
-		// Package cmpv
-		/* breath-first search */
-
-		EList<Package> result = new BasicEList<Package>();
-
-		final LinkedList<Package> breadthFirstList = new LinkedList<Package>();
-		breadthFirstList.addFirst(pack);
-		while (!breadthFirstList.isEmpty()) {
-			final Package candidate = breadthFirstList.poll();
-
-			CHGaResourcePlatform a = UMLUtils.getStereotypeApplication(candidate, CHGaResourcePlatform.class);
-
-			if (a != null)
-				result.add(candidate);
-			// return candidate;
-
-			for (final Package p : candidate.getNestedPackages()) {
-				breadthFirstList.addLast(p);
-			}
-		}
-		return result;
-		// return null;
-	}
-
-	/**
-	 * Returns the list of CHGaResourcePlatforms found inside the given Package.
-	 *
-	 * @param cmpv is the given package
-	 * @return the resource platform packages
-	 */
-	public static List<Package> getResourcePlatformPackages(Package cmpv) {
-		List<Package> candidates = new ArrayList<Package>();
-		/* breath-first search */
-		final LinkedList<Package> breadthFirstList = new LinkedList<Package>();
-		breadthFirstList.addFirst(cmpv);
-		while (!breadthFirstList.isEmpty()) {
-			final Package candidate = breadthFirstList.poll();
-
-			CHGaResourcePlatform a = UMLUtils.getStereotypeApplication(candidate, CHGaResourcePlatform.class);
-
-			if (a != null)
-				candidates.add(candidate);
-
-			for (final Package p : candidate.getNestedPackages()) {
-				breadthFirstList.addLast(p);
-			}
-		}
-		return candidates;
-	}
-
-	/**
-	 * Returns a Component that is stereotyped as CHGaResourcePlatform inside the view with the given name 
-	 * in the given model.
-	 *
-	 * @param umlModel the uml model
-	 * @param viewName the view name
-	 * @return the resource platform component
-	 * @throws ModelError the model error
-	 */
-	public static Component getResourcePlatformComponent(Model umlModel, String viewName) throws ModelError {
-		Package parent = CHESSProfileManager.getViewByStereotype(umlModel, viewName);
-
-		if (parent == null)
-			throw new ModelError(viewName + " not found.");
-
-		/* breath-first search */
-		final LinkedList<Element> breadthFirstList = new LinkedList<Element>();
-
-		breadthFirstList.addAll(parent.getOwnedElements());
-		while (!breadthFirstList.isEmpty()) {
-			final Element t = breadthFirstList.poll();
-
-			if (t instanceof Component) {
-				Component candidate = (Component) t;
-				CHGaResourcePlatform a = UMLUtils.getStereotypeApplication(candidate, CHGaResourcePlatform.class);
-				if (a != null)
-					return candidate;
-			}
-			for (final Element e : t.getOwnedElements()) {
-				breadthFirstList.addLast(e);
-			}
-		}
-
-		throw new ModelError("CHGaResourcePlatform not found in " + viewName + " view.");
-	}
-
-	/**
-	 * Returns true if the given InstanceSpecification is a functional Partition, false otherwise.
-	 *
-	 * @param e the e
-	 * @return true, if is partition instance
-	 */
-	public static boolean isPartitionInstance(InstanceSpecification e) {
-		for (Classifier c : e.getClassifiers()) {
-
-			if (UMLUtils.getStereotypeApplication(c, FunctionalPartition.class) != null)
-				return true;
-
-		}
-		return false;
-	}
-
-	/**
-	 * Returns true if the given InstanceSpecification is a ComponentImplementation, false otherwise.
-	 *
-	 * @param e the e
-	 * @return true, if is component instance
-	 */
-	public static boolean isComponentInstance(InstanceSpecification e) {
-		for (Classifier c : e.getClassifiers()) {
-			if (UMLUtils.getStereotypeApplication(c, ComponentImplementation.class) != null)
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if is guarded.
-	 *
-	 * @param spec the spec
-	 * @return true, if is guarded
-	 */
-	public static boolean isGuarded(CHRtSpecification spec) {
-		return spec.getProtection().getName().equals(CallConcurrencyKind.GUARDED.getName());
-	}
-
-	/**
-	 * Checks if is occ kind sporadic or periodic.
-	 *
-	 * @param occKind the occ kind
-	 * @return true, if is occ kind sporadic or periodic
-	 */
-	public static boolean isOccKindSporadicOrPeriodic(String occKind) {
-		if (occKind == null)
-			return false;
-		return isOccKindSporadic(occKind) || isOccKindPeriodic(occKind);
-	}
-
-	/**
-	 * Checks if is occ kind sporadic.
-	 *
-	 * @param occKind the occ kind
-	 * @return true, if is occ kind sporadic
-	 */
-	public static boolean isOccKindSporadic(String occKind) {
-		String t = occKind.toLowerCase();
-		return t.matches(".*sporadic.*");
-	}
-
-	/**
-	 * Checks if is occ kind periodic.
-	 *
-	 * @param occKind the occ kind
-	 * @return true, if is occ kind periodic
-	 */
-	public static boolean isOccKindPeriodic(String occKind) {
-		String t = occKind.toLowerCase();
-		return t.matches(".*periodic.*");
-	}
-
-	/**
-	 * Returns the OccKindInfo that correspomnds to the input string.
-	 *
-	 * @param occKind the String with the occurrency kind information
-	 * @return OccKindInfo
-	 */
-	public static OccKindInfo getOccKindInfo(String occKind) {
-		StringParser sp = new StringParser();
-		OccKindInfo info = new OccKindInfo();
-		if (isOccKindSporadic(occKind)) {
-			info.value = sp.getValuePattern(occKind, "minInterarrival");
-			info.type = "sporadic";
-			info.unit = sp.getUnitPattern(occKind, "minInterarrival");
-		} else if (occKind.toLowerCase().matches(".*periodic.*")) {
-			info.value = sp.getValuePattern(occKind, "period");
-			info.unit = sp.getUnitPattern(occKind, "period");
-			info.type = "periodic";
-		} else {
-			return null;
-		}
-
-		return info;
-	}
-
-	/**
-	 * Returns a map with the Component to Partition assignments.
-	 *
-	 * @param umlModel the uml model
-	 * @param parent the parent
-	 * @return the map
-	 * @throws ModelError the model error
-	 */
-	public static Map<InstanceSpecification, Set<CHRtSpecification>> buildPartitionComponentMap(Model umlModel, Package parent) throws ModelError {
-		Map<InstanceSpecification, Set<CHRtSpecification>> map = new HashMap<InstanceSpecification, Set<CHRtSpecification>>();
-
-		EList<Assign> assignmentList = UMLUtils.getComponent2PartitionAssignments(umlModel, CHESSProfileManager.COMPONENT_VIEW);
-		if (!assignmentList.isEmpty()) {
-			for (Assign assign : assignmentList) {
-				if (assign == null)
-					continue;
-				for (Element i : assign.getFrom()) {
-					if (i instanceof InstanceSpecification) {
-						InstanceSpecification ii = (InstanceSpecification) i;
-						processComponentInstance(map, assign, ii);
-					}
-				}
-
-			}
-		}
-
-		return map;
-	}
-
-	/**
-	 * Returns a map with the Partition to Core assignments.
-	 *
-	 * @param umlModel the uml model
-	 * @return the map
-	 * @throws ModelError the model error
-	 */
-	public static Map<String, Set<InstanceSpecification>> buildPartitionCoreMap(Model umlModel) throws ModelError {
-		Map<String, Set<InstanceSpecification>> map = new HashMap<String, Set<InstanceSpecification>>();
-
-		EList<Assign> assignmentList = UMLUtils.getPartition2CoreAssignments(umlModel, CHESSProfileManager.DEPLOYMENT_VIEW);
-		if (!assignmentList.isEmpty()) {
-			for (Assign assign : assignmentList) {
-
-				for (Element i : assign.getFrom()) {
-					if (i instanceof InstanceSpecification) {
-						processPartitionInstance(map, assign);
-					}
-				}
-
-			}
-		}
-		return map;
-	}
-
-	// public static Map<InstanceSpecification, Set<CHRtSpecification>>
-	// buildPartitionComponentMap(Component parent) {
-	// Map<InstanceSpecification, Set<CHRtSpecification>> map = new
-	// HashMap<InstanceSpecification, Set<CHRtSpecification>>();
-	// for (Comment el : parent.getOwnedComments()) {
-	//
-	// Comment assignComment = (Comment) el;
-	// Assign assign = UMLUtils.getStereotypeApplication(assignComment,
-	// Assign.class);
-	// if (assign == null)
-	// continue;
-	// for (Element i : assign.getFrom()) {
-	// if (i instanceof InstanceSpecification) {
-	// InstanceSpecification ii = (InstanceSpecification) i;
-	// processComponentInstance(map, assign, ii);
-	// }
-	// }
-	//
-	// }
-	// return map;
-	// }
-
-	/**
-	 * Process partition instance.
-	 *
-	 * @param map the map
-	 * @param assign the assign
-	 */
-	private static void processPartitionInstance(Map<String, Set<InstanceSpecification>> map, Assign assign) {
-
-		try {
-			if (assign.getImpliedConstraint().size() > 0) {
-				for (Object c : assign.getImpliedConstraint().toArray()) {
-					if (c instanceof NfpConstraint) {
-						ValueSpecification x = ((NfpConstraint) c).getBase_Constraint().getSpecification();
-						if (x instanceof LiteralString) {
-							LiteralString s = (LiteralString) x;
-							String coreName = ((NamedElement) assign.getTo().get(0)).getName() + s.getValue();
-							InstanceSpecification part = (InstanceSpecification) assign.getFrom().get(0);
-
-							Set<InstanceSpecification> value = map.get(coreName);
-							if (value == null)
-								value = new HashSet<InstanceSpecification>();
-							value.add(part);
-							map.put(coreName, value);
-						}
-					}
-
-				}
-			}
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-	}
-
-	/**
-	 * Process component instance.
-	 *
-	 * @param map the map
-	 * @param assign the assign
-	 * @param instanceSpec the instance spec
-	 */
-	private static void processComponentInstance(Map<InstanceSpecification, Set<CHRtSpecification>> map, Assign assign, InstanceSpecification instanceSpec) {
-
-		for (Element element : instanceSpec.getOwnedElements()) {
-			if (element instanceof Slot) {
-				Slot slot = (Slot) element;
-				CHRtPortSlot chSlot = UMLUtils.getStereotypeApplication(slot, CHRtPortSlot.class);
-				if (chSlot != null) {
-					EList<CHRtSpecification> chSpecs = chSlot.getCH_RtSpecification();
-
-					addToMap(map, assign.getTo(), chSpecs);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Adds the to map.
-	 *
-	 * @param map the map
-	 * @param to the to
-	 * @param chSpecs the ch specs
-	 */
-	/* add only periodic or sporadic components */
-	private static void addToMap(Map<InstanceSpecification, Set<CHRtSpecification>> map, EList<Element> to, EList<CHRtSpecification> chSpecs) {
-		for (Element partition : to) {
-			if (partition instanceof InstanceSpecification) {
-				InstanceSpecification p = (InstanceSpecification) partition;
-				for (CHRtSpecification chRtSpecification : chSpecs) {
-					String occKind = chRtSpecification.getOccKind();
-					if (occKind != null) {
-						if (isOccKindSporadicOrPeriodic(occKind)) {
-							addToMap(map, p, chRtSpecification);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	
-	/**
-	 * Adds the to map.
-	 *
-	 * @param map the map
-	 * @param p the p
-	 * @param chRtSpecification the ch rt specification
-	 */
-	private static void addToMap(Map<InstanceSpecification, Set<CHRtSpecification>> map, InstanceSpecification p, CHRtSpecification chRtSpecification) {
-		Set<CHRtSpecification> value = map.get(p);
-		if (value == null)
-			value = new HashSet<CHRtSpecification>();
-		value.add(chRtSpecification);
-		map.put(p, value);
-
-	}
-
-	
-	/**
-	 * Returns true if the given InstanceSpecification is sterotyped as CH_HwProcessor.
-	 *
-	 * @param e the e
-	 * @return true, if is processor instance
-	 */
-	public static boolean isProcessorInstance(InstanceSpecification e) {
-		for (Classifier c : e.getClassifiers()) {
-			if (UMLUtils.getStereotypeApplication(c, CH_HwProcessor.class) != null)
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * check if an instance specification is an instance of a MARTE Device.
-	 *
-	 * @param instSpec the inst spec
-	 * @return true if the input is an instance of a MARTE Device, false
-	 *         otherwise.
-	 */
-	public static boolean isDeviceInstance(InstanceSpecification instSpec) {
-		Classifier classifier = instSpec.getClassifiers().get(0);
-		EList<Stereotype> stereotypeList = classifier.getAppliedStereotypes();
-		for (Stereotype theStereo : stereotypeList) {
-			EObject object = classifier.getStereotypeApplication(theStereo);
-			if (object instanceof HwDevice) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Gets the one processor.
-	 *
-	 * @param umlModel the uml model
-	 * @return the one processor
-	 */
-	public static CH_HwProcessor getOneProcessor(Model umlModel) {
-		Package depv = CHESSProfileManager.getViewByStereotype((Model) umlModel, CHESSProfileManager.DEPLOYMENT_VIEW);
-		depv = QueryUtils.getOneResourcePlatformPackage(depv);
-		if (depv != null) {
-			EList<Element> all = depv.allOwnedElements();
-			for (Element element : all) {
-				if (element instanceof InstanceSpecification) {
-					InstanceSpecification e = (InstanceSpecification) element;
-					if (e.getQualifiedName() != null && QueryUtils.isProcessorInstance(e)) {
-						CH_HwProcessor t = UMLUtils.getStereotypeApplication(e, CH_HwProcessor.class);
-						return t;
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Gets the all processor instances.
-	 *
-	 * @param umlModel the uml model
-	 * @return the all processor instances
-	 * @throws ModelError the model error
-	 */
-	public static EList<CH_HwProcessor> getAllProcessorInstances(Model umlModel) throws ModelError {
-		EList<CH_HwProcessor> processors = new BasicEList<CH_HwProcessor>();
-		Package depv = CHESSProfileManager.getViewByStereotype((Model) umlModel, CHESSProfileManager.DEPLOYMENT_VIEW);
-
-		if (depv == null)
-			throw new ModelError("Deployment view not found.");
-
-		List<Package> platformPackages = QueryUtils.getResourcePlatformPackages(depv);
-
-		if (platformPackages.isEmpty())
-			throw new ModelError("CHGaResourcePlatform not found in Deployment view.");
-
-		for (Package pp : platformPackages) {
-			EList<Element> all = pp.allOwnedElements();
-			for (Element element : all) {
-				if (element instanceof InstanceSpecification) {
-					InstanceSpecification e = (InstanceSpecification) element;
-					if (e.getQualifiedName() != null && QueryUtils.isProcessorInstance(e)) {
-						CH_HwProcessor t = UMLUtils.getStereotypeApplication(e, CH_HwProcessor.class);
-						processors.add(t);
-					}
-				}
-			}
-		}
-
-		if (processors.size() == 0)
-			throw new ModelError("Processors not found.");
-
-		return processors;
-	}
-
-	/**
-	 * Gets the all processor instances in package.
-	 *
-	 * @param thePackage the the package
-	 * @return the all processor instances in package
-	 * @throws ModelError the model error
-	 */
-	public static EList<CH_HwProcessor> getAllProcessorInstancesInPackage(Package thePackage) throws ModelError {
-		EList<CH_HwProcessor> processors = new BasicEList<CH_HwProcessor>();
-
-		EList<Element> all = thePackage.allOwnedElements();
-		for (Element element : all) {
-			if (element instanceof InstanceSpecification) {
-				InstanceSpecification e = (InstanceSpecification) element;
-				if (e.getQualifiedName() != null && QueryUtils.isProcessorInstance(e)) {
-					CH_HwProcessor t = UMLUtils.getStereotypeApplication(e, CH_HwProcessor.class);
-					processors.add(t);
-				}
-			}
-		}
-		if (processors.size() == 0)
-			throw new ModelError("Processors not found.");
-
-		return processors;
-	}
-
-	
-	/**
-	 * Filter multi core processors.
-	 *
-	 * @param processors the processors
-	 * @return the e list
-	 */
-	public static EList<CH_HwProcessor> filterMultiCoreProcessors(EList<CH_HwProcessor> processors) {
-		EList<CH_HwProcessor> candidates = new BasicEList<CH_HwProcessor>();
-		for (CH_HwProcessor processor : processors) {
-			if (getCores(processor).size() > 1)
-				candidates.add(processor);
-		}
-		return candidates;
-
-	}
-
-	
-	/**
-	 * Gets the cores.
-	 *
-	 * @param processor the processor
-	 * @return the cores
-	 */
-	public static EList<CHCore> getCores(CH_HwProcessor processor) {
-		InstanceSpecification processorBaseInst = processor.getBase_InstanceSpecification();
-		Component processorComponent = (Component) processorBaseInst.getClassifiers().get(0);
-
-		Stereotype chHwProcessorStereo = processorComponent.getAppliedStereotype(Constants.CH_HWPROCESSOR);
-		CH_HwProcessor chHwProc = (CH_HwProcessor) processorComponent.getStereotypeApplication(chHwProcessorStereo);
-
-		String coreNumber = null;
-		coreNumber = chHwProc.getNbCores();
-		int icoreNumber = 1;
-		try {
-			icoreNumber = Integer.parseInt(coreNumber);
-		} catch (Exception e) {
-			icoreNumber = 1;
-		}
-		EList<CHCore> cores = new BasicEList<CHCore>();
-		for (int i = 0; i < icoreNumber; i++) {
-			cores.add(new CHCore(processor, QueryUtils.buildCoreName(i)));
-		}
-		return cores;
-	}
-
-	
-	/**
-	 * Gets the all partition instances.
-	 *
-	 * @param umlModel the uml model
-	 * @return the all partition instances
-	 * @throws ModelError the model error
-	 */
-	public static EList<InstanceSpecification> getAllPartitionInstances(Model umlModel) throws ModelError {
-
-		Package cmpv = CHESSProfileManager.getViewByStereotype(umlModel, CHESSProfileManager.COMPONENT_VIEW);
-
-		if (cmpv == null)
-			throw new ModelError("Component view not found.");
-
-		cmpv = QueryUtils.getOneResourcePlatformPackage(cmpv);
-
-		if (cmpv == null)
-			throw new ModelError("CHGaResourcePlatform not found in Component View.");
-
-		EList<Element> all = cmpv.allOwnedElements();
-		EList<InstanceSpecification> partitions = new BasicEList<InstanceSpecification>();
-		for (Element element : all) {
-			if (!(element instanceof InstanceSpecification))
-				continue;
-
-			InstanceSpecification is = (InstanceSpecification) element;
-
-			if (!(is.getQualifiedName() != null && QueryUtils.isPartitionInstance(is)))
-				continue;
-			partitions.add(is);
-		}
-
-		if (partitions.size() == 0)
-			throw new ModelError("Partition Instances not found.");
-
-		return partitions;
-	}
-
-	
-	/**
-	 * Gets the all component instances.
-	 *
-	 * @param umlModel the uml model
-	 * @return the all component instances
-	 * @throws ModelError the model error
-	 */
-	public static EList<InstanceSpecification> getAllComponentInstances(Model umlModel) throws ModelError {
-
-		Package cmpv = CHESSProfileManager.getViewByStereotype(umlModel, CHESSProfileManager.COMPONENT_VIEW);
-
-		if (cmpv == null)
-			throw new ModelError("Component view not found.");
-
-		cmpv = QueryUtils.getOneResourcePlatformPackage(cmpv);
-
-		if (cmpv == null)
-			throw new ModelError("CHGaResourcePlatform not found in Component View.");
-
-		EList<Element> all = cmpv.allOwnedElements();
-		EList<InstanceSpecification> components = new BasicEList<InstanceSpecification>();
-		for (Element element : all) {
-			if (!(element instanceof InstanceSpecification))
-				continue;
-
-			InstanceSpecification is = (InstanceSpecification) element;
-
-			if (!(is.getQualifiedName() != null && QueryUtils.isComponentInstance(is)))
-				continue;
-			components.add(is);
-
-		}
-		if (components.size() == 0)
-			throw new ModelError("Component Instances not found.");
-
-		return components;
-	}
-
-	
-	/**
-	 * Gets the all task instances.
-	 *
-	 * @param umlModel the uml model
-	 * @return the all task instances
-	 * @throws ModelError the model error
-	 */
-	public static EList<CHTask> getAllTaskInstances(Model umlModel) throws ModelError {
-
-		EList<CHTask> tasks = new BasicEList<CHTask>();
-
-		EList<InstanceSpecification> x = getAllComponentInstances(umlModel);
-		for (InstanceSpecification instanceSpecification : x) {
-			for (Element element1 : instanceSpecification.getOwnedElements()) {
-
-				if (!(element1 instanceof Slot))
-					continue;
-
-				Slot slot = (Slot) element1;
-				CHRtPortSlot chSlot = UMLUtils.getStereotypeApplication(slot, CHRtPortSlot.class);
-				if (chSlot == null)
-					continue;
-
-				EList<CHRtSpecification> chSpecs = chSlot.getCH_RtSpecification();
-
-				for (CHRtSpecification chRtSpecification : chSpecs) {
-					tasks.add(new CHTask(chSlot, chRtSpecification));
-				}
-			}
-		}
-		if (tasks.size() == 0)
-			throw new ModelError("Tasks Instances not found.");
-
-		return tasks;
-	}
-
-	/**
-	 * Delete task 2 core associations.
-	 *
-	 * @param hwSystem the hw system
-	 */
-	public static void deleteTask2CoreAssociations(Component hwSystem) {
-		deleteAssociations(hwSystem, TASK_TO_CORE);
-	}
-
-	/**
-	 * Delete component 2 core associations.
-	 *
-	 * @param hwSystem the hw system
-	 */
-	public static void deleteComponent2CoreAssociations(Component hwSystem) {
-		deleteAssociations(hwSystem, COMPONENT_TO_CORE);
-	}
-
-	/**
-	 * Delete partition 2 core associations.
-	 *
-	 * @param hwSystem the hw system
-	 */
-	public static void deletePartition2CoreAssociations(Component hwSystem) {
-		deleteAssociations(hwSystem, PARTITION_TO_CORE);
-	}
-
-	
-	/**
-	 * Builds the instance 2 core assignments.
-	 *
-	 * @param hwSystem the hw system
-	 * @param result the result
-	 */
-	public static void buildInstance2CoreAssignments(Component hwSystem, Map<CHCore, LinkedHashSet<Object>> result) {
-
-		for (CHCore core : result.keySet()) {
-			for (Object o : result.get(core)) {
-				if (o instanceof InstanceSpecification) {
-					InstanceSpecification componentInst = (InstanceSpecification) o;
-					Comment c = hwSystem.createOwnedComment();
-					UMLUtils.applyStereotype(c, MARTE_ASSIGN);
-					Assign assign = UMLUtils.getStereotypeApplication(c, Assign.class);
-					assign.getFrom().add(componentInst);
-					assign.getTo().add(core.getProcessorInstance());
-
-					Constraint n = hwSystem.createOwnedRule(core.getName());
-					UMLUtils.applyStereotype(n, MARTE_NFPCONSTRAINT);
-					NfpConstraint rule = UMLUtils.getStereotypeApplication(n, NfpConstraint.class);
-
-					ValueSpecification valueSpec = n.createSpecification("core", null, UMLPackage.Literals.LITERAL_STRING);
-					LiteralString value = (LiteralString) valueSpec;
-					value.setValue(core.getName());
-					assign.getImpliedConstraint().add(rule);
-				}
-			}
-		}
-	}
-
-	
-	/**
-	 * Gets the CHRT spec from instances.
-	 *
-	 * @param instances the instances
-	 * @return the CHRT spec from instances
-	 */
-	public static Set<CHRtSpecification> getCHRTSpecFromInstances(EList<InstanceSpecification> instances) {
-
-		Set<CHRtSpecification> result = new HashSet<CHRtSpecification>();
-
-		for (InstanceSpecification is : instances) {
-			for (Element el : is.getOwnedElements()) {
-				if (!(el instanceof Slot))
-					continue;
-
-				Slot slot = (Slot) el;
-				CHRtPortSlot chSlot = UMLUtils.getStereotypeApplication(slot, CHRtPortSlot.class);
-				if (chSlot == null)
-					continue;
-
-				EList<CHRtSpecification> chSpecs = chSlot.getCH_RtSpecification();
-				for (CHRtSpecification chRtSpecification : chSpecs) {
-					String occKind = chRtSpecification.getOccKind();
-					if (occKind != null && isOccKindSporadicOrPeriodic(occKind)) {
-						result.add(chRtSpecification);
-					}
-				}
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * Gets the CH tasks.
-	 *
-	 * @param instances the instances
-	 * @return the CH tasks
-	 */
-	public static Map<CHRtSpecification, Slot> getCHTasks(EList<InstanceSpecification> instances) {
-
-		Map<CHRtSpecification, Slot> result = new HashMap<CHRtSpecification, Slot>();
-
-		for (InstanceSpecification is : instances) {
-			for (Element el : is.getOwnedElements()) {
-
-				if (!(el instanceof Slot))
-					continue;
-
-				Slot slot = (Slot) el;
-				CHRtPortSlot chSlot = UMLUtils.getStereotypeApplication(slot, CHRtPortSlot.class);
-				if (chSlot == null)
-					continue;
-
-				EList<CHRtSpecification> chSpecs = chSlot.getCH_RtSpecification();
-				for (CHRtSpecification chRtSpecification : chSpecs) {
-					String occKind = chRtSpecification.getOccKind();
-					if (occKind != null) {
-						if (isOccKindSporadicOrPeriodic(occKind)) {
-							result.put(chRtSpecification, slot);
-						}
-					}
-				}
-			}
-		}
-
-		return result;
-	}
-
-	
-	/**
-	 * Gets the CH tasks list.
-	 *
-	 * @param instances the instances
-	 * @return the CH tasks list
-	 */
-	public static EList<CHTask> getCHTasksList(EList<InstanceSpecification> instances) {
-
-		EList<CHTask> result = new BasicEList<CHTask>();
-
-		for (InstanceSpecification is : instances) {
-			for (Element el : is.getOwnedElements()) {
-
-				if (!(el instanceof Slot))
-					continue;
-
-				Slot slot = (Slot) el;
-				CHRtPortSlot chSlot = UMLUtils.getStereotypeApplication(slot, CHRtPortSlot.class);
-				if (chSlot == null)
-					continue;
-
-				EList<CHRtSpecification> chSpecs = chSlot.getCH_RtSpecification();
-				for (CHRtSpecification chRtSpecification : chSpecs) {
-					String occKind = chRtSpecification.getOccKind();
-					if (occKind != null && isOccKindSporadicOrPeriodic(occKind)) {
-						result.add(new CHTask(chSlot, chRtSpecification));
-					}
-				}
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * Builds the task 2 core assignments.
-	 *
-	 * @param hwSystem the hw system
-	 * @param processor the processor
-	 * @param coresToCHRtSpec the cores to CH rt spec
-	 * @param mapCHRtSpecToInstances the map CH rt spec to instances
-	 */
-	public static void buildTask2CoreAssignments(Component hwSystem, InstanceSpecification processor, Map<String, LinkedHashSet<CHRtSpecification>> coresToCHRtSpec,
-			Map<CHRtSpecification, InstanceSpecification> mapCHRtSpecToInstances) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/**
-	 * Gets the operation chain.
-	 *
-	 * @param umlModel the uml model
-	 * @param chtasks the chtasks
-	 * @return the operation chain
-	 * @throws ModelError the model error
-	 */
-	/*
-	 * foreach deferred op get its slot in the instance package get its activity
-	 * diagram if any collect the called operations get the corresponding
-	 * component and so its specification
-	 * 
-	 * this is useful to calculate the WCET of the task generated from the
-	 * deferred op
-	 */
-	public static HashMap<CHTask, EList<CHTask>> getOperationChain(Model umlModel, EList<CHTask> chtasks) throws ModelError {
-		Package instPkg = InstanceQuery.getInstanceSpecPackage(umlModel);
-		if (instPkg == null) {
-			throw new ModelError("Instance package not in the model: use the create instance command to create this package");
-		}
-		HashMap<CHTask, EList<CHTask>> map = new HashMap<CHTask, EList<CHTask>>();
-		for (CHTask dOp : chtasks) {
-			System.out.println(dOp.getCHRtSpecification().getContext().getName());
-			EList<CHTask> list = new BasicEList<CHTask>();
-			CHRtPortSlot chRtPortSlot = InstanceQuery.getCHRtPortSlot(instPkg, dOp.getCHRtSpecification());
-			slot2EndToEndWorkFlow(instPkg, chRtPortSlot, dOp.getCHRtSpecification(), list);
-			map.put(dOp, list);
-		}
-		return map;
-	}
-
-	/**
-	 * Gets the operation chain 2.
-	 *
-	 * @param umlModel the uml model
-	 * @param chtasks the chtasks
-	 * @return the operation chain 2
-	 * @throws ModelError the model error
-	 */
-	public static HashMap<CHRtSpecification, EList<CHTask>> getOperationChain2(Model umlModel, Set<CHRtSpecification> chtasks) throws ModelError {
-		Package instPkg = InstanceQuery.getInstanceSpecPackage(umlModel);
-		if (instPkg == null) {
-			throw new ModelError("Instance package not in the model: use the create instance command to create this package");
-		}
-		HashMap<CHRtSpecification, EList<CHTask>> map = new HashMap<CHRtSpecification, EList<CHTask>>();
-		for (CHRtSpecification dOp : chtasks) {
-			System.out.println(dOp.getContext().getName());
-			EList<CHTask> list = new BasicEList<CHTask>();
-			CHRtPortSlot chRtPortSlot = InstanceQuery.getCHRtPortSlot(instPkg, dOp);
-			slot2EndToEndWorkFlow(instPkg, chRtPortSlot, dOp, list);
-			map.put(dOp, list);
-		}
-		return map;
-	}
-
-	
-	/**
-	 * Slot 2 end to end work flow.
-	 *
-	 * @param instPkg the inst pkg
-	 * @param currentChSlot the current ch slot
-	 * @param dOp the d op
-	 * @param list the list
-	 * @throws ModelError the model error
-	 */
-	private static void slot2EndToEndWorkFlow(Package instPkg, CHRtPortSlot currentChSlot, CHRtSpecification dOp, EList<CHTask> list) throws ModelError {
-
-		InstanceSpecification owningInstance = currentChSlot.getBase_Slot().getOwningInstance();
-		Activity method = InstanceQuery.getMethod(dOp);
-		if (method == null)
-			return;// TODO throw exception?
-		for (ActivityNode node : method.getNodes()) {
-			if (node instanceof CallOperationAction) {
-				CallOperationAction callOp = (CallOperationAction) node;
-				EList<Slot> riSlot = InstanceQuery.getSlotFromPort(callOp, owningInstance);
-				for (Slot slot : riSlot) {
-					Slot usedPiSlot = InstanceQuery.getOppositeSlot(slot);
-					CHRtSpecification usedCH = InstanceQuery.getCHFromSlot(usedPiSlot, callOp.getOperation());
-					CHRtPortSlot ch = UMLUtils.getStereotypeApplication(usedPiSlot, CHRtPortSlot.class);
-					if (!InstanceQuery.isDeferred(usedCH)) {
-						list.add(new CHTask(ch, usedCH));
-						slot2EndToEndWorkFlow(instPkg, ch, usedCH, list);
-					}
-					//
-					// Operation operation = callOp.getOperation();//=>use to match the
-					// context of the chrtspec
-					// Port riPort = callOp.getOnPort();//=>get link and then pi then
-					// chrtspec
-					// Port piPort = getOppositePort(riPort);
-					// getCHRtCommentsfromPort(piPort, operation);
-				}
-
-			}
-		}
-	}
-
-	
-	/**
-	 * Wcet unit.
-	 *
-	 * @param wcetSpec the wcet spec
-	 * @param theUnit the the unit
-	 * @return the int
-	 */
-	private static int wcetUnit(String wcetSpec, String theUnit) {
-		int ret = -1;
-		if (wcetSpec == null)
-			return ret;
-
-		StringParser sp = new StringParser();
-		double value = sp.getValueNFP(wcetSpec);
-		String unit = sp.getUnitNFP(wcetSpec);
-
-		if (value == -1)
-			return ret;
-
-		int intValue = unitConversion(value, unit, theUnit);
-		return intValue;
-	}
-
-	
-	/**
-	 * Unit conversion float.
-	 *
-	 * @param value the value
-	 * @param fromUnit the from unit
-	 * @param toUnit the to unit
-	 * @return the float
-	 */
-	public static float unitConversionFloat(double value, String fromUnit, String toUnit) {
-		int toFactor = 1000000;
-
-		if (toUnit.equalsIgnoreCase("s")) {
-			toFactor = 1000000000;
-		} else if (toUnit.equalsIgnoreCase("ms")) {
-			toFactor = 1000000;
-		} else if (toUnit.equalsIgnoreCase("us")) {
-			toFactor = 1000;
-		} else if (toUnit.equalsIgnoreCase("ns")) {
-			toFactor = 1;
-		}
-
-		int fromFactor = 1000000;
-
-		if (fromUnit.equalsIgnoreCase("s")) {
-			fromFactor = 1000000000;
-		} else if (fromUnit.equalsIgnoreCase("ms")) {
-			fromFactor = 1000000;
-		} else if (fromUnit.equalsIgnoreCase("us")) {
-			fromFactor = 1000;
-		} else if (fromUnit.equalsIgnoreCase("ns")) {
-			fromFactor = 1;
-		}
-
-		float ratio = (float) fromFactor / toFactor;
-		float intValue = (float) (value * ratio);
-		return intValue;
-	}
-
-	
-	/**
-	 * Wcet unit float.
-	 *
-	 * @param wcetSpec the wcet spec
-	 * @param theUnit the the unit
-	 * @return the float
-	 */
-	private static float wcetUnitFloat(String wcetSpec, String theUnit) {
-		int ret = -1;
-		if (wcetSpec == null)
-			return ret;
-
-		StringParser sp = new StringParser();
-		double value = sp.getValueNFP(wcetSpec);
-		String unit = sp.getUnitNFP(wcetSpec);
-
-		if (value == -1)
-			return ret;
-
-		return unitConversionFloat(value, unit, theUnit);
-	}
-
-	
-	/**
-	 * Unit conversion.
-	 *
-	 * @param value the value
-	 * @param fromUnit the from unit
-	 * @param toUnit the to unit
-	 * @return the int
-	 */
-	public static int unitConversion(double value, String fromUnit, String toUnit) {
-		int toFactor = 1000000;
-
-		if (toUnit.equalsIgnoreCase("s")) {
-			toFactor = 1000000000;
-		} else if (toUnit.equalsIgnoreCase("ms")) {
-			toFactor = 1000000;
-		} else if (toUnit.equalsIgnoreCase("us")) {
-			toFactor = 1000;
-		} else if (toUnit.equalsIgnoreCase("ns")) {
-			toFactor = 1;
-		}
-
-		int fromFactor = 1000000;
-
-		if (fromUnit.equalsIgnoreCase("s")) {
-			fromFactor = 1000000000;
-		} else if (fromUnit.equalsIgnoreCase("ms")) {
-			fromFactor = 1000000;
-		} else if (fromUnit.equalsIgnoreCase("us")) {
-			fromFactor = 1000;
-		} else if (fromUnit.equalsIgnoreCase("ns")) {
-			fromFactor = 1;
-		}
-
-		double ratio = (double) fromFactor / toFactor;
-		int intValue = (int) Math.round(value * ratio);
-		return intValue;
-	}
-
-	
-	/**
-	 * Gets the WCE tunit float.
-	 *
-	 * @param chRtSpecification the ch rt specification
-	 * @param unitOfMeasure the unit of measure
-	 * @return the WCE tunit float
-	 * @throws ModelError the model error
-	 */
-	public static float getWCETunitFloat(CHRtSpecification chRtSpecification, String unitOfMeasure) throws ModelError {
-
-		StringParser sp = new StringParser();
-		String wcet = chRtSpecification.getLocalWCET();
-		float intValue = wcetUnitFloat(wcet, unitOfMeasure);
-
-		if (intValue != -1)
-			return intValue;
-
-		wcet = chRtSpecification.getWCET();
-
-		intValue = wcetUnit(wcet, unitOfMeasure);
-		if (intValue != -1)
-			return intValue;
-
-		throw new ModelError("WCET for %s is not set correctly", chRtSpecification.getContext().getName());
-	}
-
-	
-	/**
-	 * Gets the WCE tunit.
-	 *
-	 * @param chRtSpecification the ch rt specification
-	 * @param unitOfMeasure the unit of measure
-	 * @return the WCE tunit
-	 * @throws ModelError the model error
-	 */
-	public static int getWCETunit(CHRtSpecification chRtSpecification, String unitOfMeasure) throws ModelError {
-
-		StringParser sp = new StringParser();
-		String wcet = chRtSpecification.getLocalWCET();
-		int intValue = wcetUnit(wcet, unitOfMeasure);
-
-		if (intValue != -1)
-			return intValue;
-
-		wcet = chRtSpecification.getWCET();
-
-		intValue = wcetUnit(wcet, unitOfMeasure);
-		if (intValue != -1)
-			return intValue;
-
-		throw new ModelError("WCET for %s is not set correctly", chRtSpecification.getContext().getName());
-	}
-
-	/**
-	 * Gets the wcet.
-	 *
-	 * @param chRtSpecification the ch rt specification
-	 * @return the wcet
-	 * @throws ModelError the model error
-	 */
-	// TODO a similar method is implemented in the m2m plugin (Java4QVTutils.java)
-	public static double getWCET(CHRtSpecification chRtSpecification) throws ModelError {
-		StringParser sp = new StringParser();
-		double x = -1;
-		String wcet = chRtSpecification.getLocalWCET();
-		if (wcet != null) {
-			x = sp.getValueNFP(wcet);
-		}
-		if (x != -1)
-			return x;
-
-		wcet = chRtSpecification.getWCET();
-
-		if (wcet != null) {
-			x = sp.getValueNFP(wcet);
-		}
-		if (x != -1)
-			return x;
-
-		throw new ModelError("WCET for %s is not set correctly", chRtSpecification.getContext().getName());
-	}
-
-	/**
-	 * Check if Instance Specification in input is assigned to a Partition.
-	 *
-	 * @param i the i
-	 * @param assignments the assignments
-	 * @return true, if is assigned 2 partition
-	 */
-	public static boolean isAssigned2Partition(InstanceSpecification i, EList<Assign> assignments) {
-		for (Assign theAssignment : assignments) {
-			if (theAssignment != null) {
-				try {
-					if (theAssignment.getFrom().contains((Object) i) && (elementIsPartitionInstance(theAssignment.getTo().get(0)))) {
-						return true;
-					}
-				} catch (Exception e) {
-					continue;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Check if this Partition is assigned to a CPU.
-	 *
-	 * @param i the i
-	 * @param assignments the assignments
-	 * @return true, if is assigned 2 processor
-	 */
-	public static boolean isAssigned2Processor(InstanceSpecification i, EList<Assign> assignments) {
-		for (Assign theAssignment : assignments) {
-			if (theAssignment != null) {
-				try {
-					if (theAssignment.getFrom().contains((Object) i) && elementIsProcessorInstance(theAssignment.getTo().get(0))) {
-						return true;
-					}
-				} catch (Exception e) {
-					continue;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Check if this Partition is assigned to a CPU.
-	 *
-	 * @param i the i
-	 * @param pack the pack
-	 * @param assignments the assignments
-	 * @return true, if is assigned 2 core
-	 */
-	public static boolean isAssigned2Core(InstanceSpecification i, Package pack, EList<Assign> assignments) {
-		String packQN = pack.getQualifiedName();
-		String assignedTargetQN = "";
-		String assignedTargetElementName = "";
-
-		for (Assign theAssignment : assignments) {
-			if (theAssignment != null) {
-				try {
-					EList<Element> assignmentSource = theAssignment.getFrom();
-					Element assignmentTarget = theAssignment.getTo().get(0);
-					assignedTargetQN = ((NamedElement) assignmentTarget).getQualifiedName();
-					assignedTargetElementName = ((NamedElement) assignmentTarget).getLabel();
-					if (assignmentSource.contains((Object) i) && elementIsProcessorInstance(assignmentTarget)) {
-						if (!theAssignment.getImpliedConstraint().isEmpty() && theAssignment.getImpliedConstraint().get(0) != null) {
-							if ((packQN + "::" + assignedTargetElementName).equals(assignedTargetQN)) {
-								return true;
-							}
-						} else {
-							// Check if it is a single-core
-							InstanceSpecification instSpecProc = (InstanceSpecification) assignmentTarget;
-							if (processorInstanceIsSingleCore(instSpecProc)) {
-								if ((packQN + "::" + assignedTargetElementName).equals(assignedTargetQN)) {
-									return true;
-								}
-							}
-						}
-					}
-				} catch (Exception e) {
-					continue;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Check if this Partition is assigned to a CPU.
-	 *
-	 * @param i the i
-	 * @param assignments the assignments
-	 * @return true, if is assigned 2 core
-	 */
-	public static boolean isAssigned2Core(InstanceSpecification i, EList<Assign> assignments) {
-		for (Assign theAssignment : assignments) {
-			if (theAssignment != null) {
-				try {
-					if (theAssignment.getFrom().contains((Object) i) && elementIsProcessorInstance(theAssignment.getTo().get(0))) {
-						if (!theAssignment.getImpliedConstraint().isEmpty() && theAssignment.getImpliedConstraint().get(0) != null) {
-							return true;
-						} else {
-							// Check if it is a single-core
-							Element elem = theAssignment.getTo().get(0);
-							InstanceSpecification instSpecProc = (InstanceSpecification) elem;
-							if (processorInstanceIsSingleCore(instSpecProc)) {
-								return true;
-							}
-						}
-					}
-				} catch (Exception e) {
-					continue;
-				}
-			}
-		}
-		return false;
-	}
-
-	// /**
-	// * Check if this Partition is assigned to a CPU
-	// * @param i
-	// * @param assignments
-	// * @return
-	// */
-	// public static boolean isAssigned2Core(InstanceSpecification i,
-	// EList<Assign> assignments) {
-	// for (Assign theAssignment : assignments) {
-	// if (theAssignment != null) {
-	// if (theAssignment.getFrom().contains((Object)i) &&
-	// elementIsProcessorInstance(theAssignment.getTo().get(0)) &&
-	// !theAssignment.getImpliedConstraint().isEmpty()&&
-	// theAssignment.getImpliedConstraint().get(0)!=null ) {
-	// return true;
-	// }
-	// }
-	// }
-	// return false;
-	// }
-
-	/**
-	 * Returns TRUE if the given Task is assigned to a Core in the Deployment
-	 * identified by the given package.
-	 *
-	 * @param task the task
-	 * @param pack the pack
-	 * @param assignments the assignments
-	 * @return true, if is task assigned 2 core
-	 */
-	public static boolean isTaskAssigned2Core(CHTask task, Package pack, EList<Assign> assignments) {
-		String taskName = task.getCHRtSpecification().getContext().getName();
-		String packQN = pack.getQualifiedName();
-		String assignedTargetQN = "";
-		String assignedTargetElementName = "";
-
-		for (Assign theAssignment : assignments) {
-			if (theAssignment != null) {
-				try {
-					Element assignmentSource = theAssignment.getFrom().get(0);
-					Element assignmentTarget = theAssignment.getTo().get(0);
-					assignedTargetQN = ((NamedElement) assignmentTarget).getQualifiedName();
-					assignedTargetElementName = ((NamedElement) assignmentTarget).getLabel();
-					if ((packQN + "::" + assignedTargetElementName).equals(assignedTargetQN) && QueryUtils.elementIsSlotInstance(assignmentSource) && theAssignment.getImpliedConstraint() != null
-							&& !theAssignment.getImpliedConstraint().isEmpty()) {
-						String theTaskValue = getTaskNameFromImpliedNfpConstraint(theAssignment);
-						if (theTaskValue != null && theTaskValue.length() > 0) {
-							if (theTaskValue.equals(taskName)) {
-								return true;
-							}
-						}
-					}
-				} catch (Exception e) {
-					continue;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Returns true if the given task is assigned to a core, false otherwise.
-	 *
-	 * @param t the t
-	 * @param assignments the assignments
-	 * @return true if the given task is assigned to a core
-	 */
-	public static boolean isTaskAssigned2Core(CHTask t, EList<Assign> assignments) {
-		for (Assign theAssignment : assignments) {
-			if (theAssignment != null) {
-				Element assignmentSource = theAssignment.getFrom().get(0);
-				if (QueryUtils.elementIsSlotInstance(assignmentSource)) {
-					CHTask theTask = getTaskFromSlot(assignmentSource);
-					if ((theTask != null && theTask.equals(t)) && elementIsProcessorInstance(theAssignment.getTo().get(0))) {
-						return true;
-					}
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Given the Core (and related processor) get the list of partitions that are
-	 * assigned to it.
-	 *
-	 * @param core the core
-	 * @param assignments the assignments
-	 * @return the partitions assigned 2 core
-	 */
-	public static LinkedHashSet<Object> getPartitionsAssigned2Core(CHCore core, EList<Assign> assignments) {
-		LinkedHashSet<Object> result = new LinkedHashSet<Object>();
-		InstanceSpecification processorInstance = core.getProcessorInstance();
-		String theCoreName = core.getName();
-		String theCoreValue = null;
-		for (Assign theAssignment : assignments) {
-			if (theAssignment != null) {
-				try {
-					Element assignmentSource = theAssignment.getFrom().get(0);
-					// Only look at assignments where:
-					// ASSIGNMENT_SOURCE is a Partition
-					// ASSIGNMENT_TARGET is the Processor that owns the core
-					if (!QueryUtils.elementIsPartitionInstance(assignmentSource) || (!theAssignment.getTo().contains((Object) processorInstance))) {
-						continue;
-					}
-					// found an assignment for the processor that owns the core:
-					// let's look into it so see if it is related to the core we are
-					// analyzing
-					if (theAssignment.getImpliedConstraint() != null && !theAssignment.getImpliedConstraint().isEmpty()) {
-						theCoreValue = getCoreNameFromImpliedNfpConstraint(theAssignment);
-						if (theCoreValue.equals(theCoreName)) {
-							// if target of assignment is a partition
-							result.add(assignmentSource);
-						}
-					} else {
-						if (processorInstanceIsSingleCore(processorInstance)) {
-							// If no core is specified in the Implied Constraint and the
-							// Processor has only 1 Core
-							result.add(assignmentSource);
-						}
-					}
-				} catch (Exception e) {
-					continue;
-				}
-
-			}
-		}
-		return result;
-	}
-
-	
-	/**
-	 * Returns the name of the Core to which the given assignment is related.
-	 *
-	 * @param theAssignment the the assignment
-	 * @return the name of the Core to which theAssignment is related
-	 */
-	public static String getCoreNameFromImpliedNfpConstraint(Assign theAssignment) {
-		String coreName = null;
-		try {
-			NfpConstraint theImpliedNfpConstraint = theAssignment.getImpliedConstraint().get(0);
-			Constraint cnstr = theImpliedNfpConstraint.getBase_Constraint();
-			ValueSpecification valueSpec = cnstr.getSpecification();
-			LiteralString value = (LiteralString) valueSpec;
-			coreName = value.getValue();
-		} catch (Exception e) {
-			System.out.println("Error in getCoreNameFromImpliedNfpConstraint");
-		}
-		return coreName;
-	}
-
-	
-	/**
-	 * Gets the task name from implied nfp constraint.
-	 *
-	 * @param theAssignment the the assignment
-	 * @return the task name from implied nfp constraint
-	 */
-	private static String getTaskNameFromImpliedNfpConstraint(Assign theAssignment) {
-		String taskName = null;
-		try {
-			// the first one is the core, the second one is the task
-			NfpConstraint theImpliedNfpConstraint = theAssignment.getImpliedConstraint().get(1);
-			Constraint cnstr = theImpliedNfpConstraint.getBase_Constraint();
-			ValueSpecification valueSpec = cnstr.getSpecification();
-			LiteralString value = (LiteralString) valueSpec;
-			taskName = value.getValue();
-		} catch (Exception e) {
-			System.out.println("Error in getTaskNameFromImpliedNfpConstraint");
-		}
-		return taskName;
-	}
-
-	/**
-	 * Returns true if the given element is a partition instance, false otherwise.
-	 *
-	 * @param element the element
-	 * @return true if the element is a partition instance, false otherwise
-	 */
-	public static boolean elementIsPartitionInstance(Element element) {
-		if (!(element instanceof InstanceSpecification)) {
-			return false;
-		}
-		InstanceSpecification is = (InstanceSpecification) element;
-		if (is.getQualifiedName() != null && QueryUtils.isPartitionInstance(is)) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Returns true if the given element is a component instance, false otherwise.
-	 *
-	 * @param element the element
-	 * @return true if the element is a component instance, false otherwise
-	 */
-	public static boolean elementIsComponentInstance(Element element) {
-		if (!(element instanceof InstanceSpecification)) {
-			return false;
-		}
-		InstanceSpecification is = (InstanceSpecification) element;
-		if (is.getQualifiedName() != null && QueryUtils.isComponentInstance(is)) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Returns true if the given element is a processor instance, false otherwise.
-	 *
-	 * @param element the element
-	 * @return true if the element is a processor instance, false otherwise
-	 */
-	public static boolean elementIsProcessorInstance(Element element) {
-		if (!(element instanceof InstanceSpecification)) {
-			return false;
-		}
-		InstanceSpecification is = (InstanceSpecification) element;
-		if (is.getQualifiedName() != null && QueryUtils.isProcessorInstance(is)) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Given the Core (and related processor) get the list of components that are
-	 * assigned to it.
-	 *
-	 * @param core the core
-	 * @param assignments the assignments
-	 * @return the components assigned 2 core
-	 */
-	public static LinkedHashSet<Object> getComponentsAssigned2Core(CHCore core, EList<Assign> assignments) {
-		LinkedHashSet<Object> result = new LinkedHashSet<Object>();
-		InstanceSpecification processorInstance = core.getProcessorInstance();
-		String theCoreName = core.getName();
-		String theCoreValue = null;
-
-		for (Assign theAssignment : assignments) {
-			if (theAssignment != null) {
-				try {
-					// Only look at assignments where:
-					// ASSIGNMENT_SOURCE is a Component
-					// ASSIGNMENT_TARGET is the Processor that owns the core
-					Element assignmentSource = theAssignment.getFrom().get(0);
-					if (!QueryUtils.elementIsComponentInstance(assignmentSource) || !theAssignment.getTo().contains((Object) processorInstance)) {
-						continue;
-					}
-
-					// found an assignment for the processor that owns the core:
-					// let's look into it so see if it is related to the core we are
-					// analyzing
-					if (theAssignment.getImpliedConstraint() != null && !theAssignment.getImpliedConstraint().isEmpty()) {
-						theCoreValue = getCoreNameFromImpliedNfpConstraint(theAssignment);
-						if (theCoreValue.equals(theCoreName)) {
-							result.add(assignmentSource);
-						}
-					} else {
-						if (processorInstanceIsSingleCore(processorInstance)) {
-							// If no core is specified in the Implied Constraint and the
-							// Processor has only 1 Core
-							result.add(assignmentSource);
-						}
-					}
-				} catch (Exception e) {
-					continue;
-				}
-
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Given the Core (and related processor) get the list of tasks that are
-	 * assigned to it.
-	 *
-	 * @param core the core
-	 * @param pack the pack
-	 * @param assignments the assignments
-	 * @return the tasks assigned 2 core
-	 */
-	public static LinkedHashSet<Object> getTasksAssigned2Core(CHCore core, Package pack, EList<Assign> assignments) {
-		String packQN = pack.getQualifiedName();
-		LinkedHashSet<Object> result = new LinkedHashSet<Object>();
-		InstanceSpecification processorInstance = core.getProcessorInstance();
-		String theCoreName = core.getName();
-		String theCoreValue = null;
-		String theTaskValue = null;
-
-		for (Assign theAssignment : assignments) {
-			if (theAssignment != null) {
-				try {
-					if (theAssignment.getTo().contains((Object) processorInstance)) {
-						// found an assignment for the processor that owns the core:
-						// let's look into it so see if it is related to the core we are
-						// analyzing
-						Element assignmentSource = theAssignment.getFrom().get(0);
-						Element assignmentTarget = theAssignment.getTo().get(0);
-						String assignedTargetQN = ((NamedElement) assignmentTarget).getQualifiedName();
-						String assignedTargetElementName = ((NamedElement) assignmentTarget).getLabel();
-						EList<CHTask> chTaskList = new BasicEList<CHTask>();
-
-						if ((packQN + "::" + assignedTargetElementName).equals(assignedTargetQN) && theAssignment.getImpliedConstraint() != null && !theAssignment.getImpliedConstraint().isEmpty()) {
-							theCoreValue = getCoreNameFromImpliedNfpConstraint(theAssignment);
-							theTaskValue = getTaskNameFromImpliedNfpConstraint(theAssignment);
-
-							if (theCoreValue.equals(theCoreName)) {
-								if (QueryUtils.elementIsSlotInstance(assignmentSource)) {
-									chTaskList = getAllTasksFromSlot(assignmentSource);
-									for (CHTask theChTask : chTaskList) {
-										String theTaskName = theChTask.getCHRtSpecification().getContext().getName();
-										if (theChTask != null && theTaskName.equals(theTaskValue)) {
-											result.add(theChTask);
-										}
-									}
-								}
-							} else {
-								// If no core is specified in the Implied Constraint and the
-								// Processor has only 1 Core
-								if (processorInstanceIsSingleCore(processorInstance) && QueryUtils.elementIsSlotInstance(assignmentSource)) {
-									chTaskList = getAllTasksFromSlot(assignmentSource);
-									for (CHTask theChTask : chTaskList) {
-										String theTaskName = theChTask.getCHRtSpecification().getContext().getName();
-										if (theChTask != null && theTaskName.equals(theTaskValue)) {
-											result.add(theChTask);
-										}
-									}
-								}
-							}
-						}
-					}
-				} catch (Exception e) {
-					continue;
-				}
-			}
-		}
-		return result;
-	}
-
-	
-	/**
-	 * Returns the list of Component to Core assignments in the given view in the given model.
-	 *
-	 * @param umlModel the uml model
-	 * @param viewName the view name
-	 * @return the component 2 core assignments
-	 * @throws ModelError the model error
-	 */
-	public static EList<Assign> getComponent2CoreAssignments(Model umlModel, String viewName) throws ModelError {
-		// LB 20150708 we now look for assignments in the CHGA resource platform
-		// component
-		// Package cmpv = CHESSProfileManager.getViewByStereotype(umlModel,
-		// viewName);
-		// cmpv = QueryUtils.getResourcePlatformPackage(cmpv);
-
-		Component rpc = QueryUtils.getResourcePlatformComponent(umlModel, viewName);
-		EList<Element> all = rpc.allOwnedElements();
-		EList<Assign> assignments = new BasicEList<Assign>();
-		Stereotype stereo = null;
-		for (Element element : all) {
-			if ((element.getAppliedStereotype(MARTE_ASSIGN) != null)) {
-				stereo = element.getAppliedStereotype(MARTE_ASSIGN);
-				EObject eobj = element.getStereotypeApplication(stereo);
-				Assign a = (Assign) eobj;
-				Element assignmentSource = a.getFrom().get(0);
-				Element assignmentTarget = a.getTo().get(0);
-				// SOURCE must be a Component
-				// TARGET must be a Processor
-				if (elementIsProcessorInstance(assignmentTarget)) {
-					if (elementIsComponentInstance(assignmentSource)) {
-						InstanceSpecification componentInst = (InstanceSpecification) assignmentSource;
-						if (isComponentInstance(componentInst)) {
-							assignments.add(a);
-						}
-					}
-				}
-			}
-		}
-		return assignments;
-	}
-
-	
-	/**
-	 * Returns the list of Component to Partition assignments in the given view in the given model.
-	 *
-	 * @param umlModel the uml model
-	 * @param viewName the view name
-	 * @return the component 2 partition assignments
-	 * @throws ModelError the model error
-	 */
-	public static EList<Assign> getComponent2PartitionAssignments(Model umlModel, String viewName) throws ModelError {
-		// LB 20150708 we now look for assignments in the CHGA resource platform
-		// component
-		// Package cmpv = CHESSProfileManager.getViewByStereotype(umlModel,
-		// viewName);
-		// cmpv = QueryUtils.getResourcePlatformPackage(cmpv);
-
-		Component rpc = QueryUtils.getResourcePlatformComponent(umlModel, viewName);
-		EList<Element> all = rpc.allOwnedElements();
-		EList<Assign> assignments = new BasicEList<Assign>();
-		Stereotype stereo = null;
-		for (Element element : all) {
-			if ((element.getAppliedStereotype(MARTE_ASSIGN) != null)) {
-				stereo = element.getAppliedStereotype(MARTE_ASSIGN);
-				EObject eobj = element.getStereotypeApplication(stereo);
-				Assign a = (Assign) eobj;
-				Element assignmentSource = a.getFrom().get(0);
-				Element assignmentTarget = a.getTo().get(0);
-				// SOURCE must be a Component
-				// TARGET must be a Partition
-				if (elementIsPartitionInstance(assignmentTarget)) {
-					if (elementIsComponentInstance(assignmentSource)) {
-						InstanceSpecification componentInst = (InstanceSpecification) assignmentSource;
-						if (isComponentInstance(componentInst)) {
-							assignments.add(a);
-						}
-					}
-				}
-			}
-		}
-		return assignments;
-	}
-
-	
-	/**
-	 * Returns the list of Partition to Core assignments in the given view in the given model.
-	 *
-	 * @param umlModel the uml model
-	 * @param viewName the view name
-	 * @return the partition 2 core assignments
-	 * @throws ModelError the model error
-	 */
-	public static EList<Assign> getPartition2CoreAssignments(Model umlModel, String viewName) throws ModelError {
-		// LB 20150708 we now look for assignments in the CHGA resource platform
-		// component
-		// Package cmpv = CHESSProfileManager.getViewByStereotype(umlModel,
-		// viewName);
-		// cmpv = QueryUtils.getResourcePlatformPackage(cmpv);
-
-		Component rpc = QueryUtils.getResourcePlatformComponent(umlModel, viewName);
-		EList<Element> all = rpc.allOwnedElements();
-		EList<Assign> assignments = new BasicEList<Assign>();
-		Stereotype stereo = null;
-		for (Element element : all) {
-			if ((element.getAppliedStereotype(MARTE_ASSIGN) != null)) {
-				stereo = element.getAppliedStereotype(MARTE_ASSIGN);
-				EObject eobj = element.getStereotypeApplication(stereo);
-				Assign a = (Assign) eobj;
-				Element assignmentSource = a.getFrom().get(0);
-				Element assignmentTarget = a.getTo().get(0);
-				// SOURCE must be a Partition
-				// TARGET must be a Processor
-				if (elementIsPartitionInstance(assignmentSource) && elementIsProcessorInstance(assignmentTarget)) {
-					assignments.add(a);
-				}
-			}
-		}
-		return assignments;
-	}
-
-	/**
-	 * Returns the list of Task to Core assignments in the given view in the given model.
-	 *
-	 * @param umlModel the uml model
-	 * @param viewName the view name
-	 * @return the task 2 core assignments
-	 * @throws ModelError the model error
-	 */
-	public static EList<Assign> getTask2CoreAssignments(Model umlModel, String viewName) throws ModelError {
-		// LB 20150708 we now look for assignments in the CHGA resource platform
-		// component
-		// Package cmpv = CHESSProfileManager.getViewByStereotype(umlModel,
-		// viewName);
-		// cmpv = QueryUtils.getResourcePlatformPackage(cmpv);
-
-		Component rpc = QueryUtils.getResourcePlatformComponent(umlModel, viewName);
-		EList<Element> all = rpc.allOwnedElements();
-		EList<Assign> assignments = new BasicEList<Assign>();
-		Stereotype stereo = null;
-		for (Element element : all) {
-			if ((element.getAppliedStereotype(MARTE_ASSIGN) != null)) {
-				stereo = element.getAppliedStereotype(MARTE_ASSIGN);
-				EObject eobj = element.getStereotypeApplication(stereo);
-				Assign a = (Assign) eobj;
-				Element assignmentSource = a.getFrom().get(0);
-				Element assignmentTarget = a.getTo().get(0);
-				// SOURCE must be a Task
-				// TARGET must be a Processor
-				if (elementIsSlotInstance(assignmentSource) && elementIsProcessorInstance(assignmentTarget)) {
-					assignments.add(a);
-				}
-			}
-		}
-		return assignments;
-	}
-
-	/**
-	 * Returns true is the input Instance Processor has only 1 CORE.
-	 *
-	 * @param processorInstance the processor instance
-	 * @return true, if successful
-	 */
-	public static boolean processorInstanceIsSingleCore(InstanceSpecification processorInstance) {
-		Classifier processorClass = processorInstance.getClassifiers().get(0);
-		CH_HwProcessor processorType = UMLUtils.getStereotypeApplication(processorClass, CH_HwProcessor.class);
-		String coreNumber = null;
-		coreNumber = processorType.getNbCores();
-		int icoreNumber = 1;
-		try {
-			icoreNumber = Integer.parseInt(coreNumber);
-		} catch (Exception e) {
-			icoreNumber = 1;
-		}
-		if (icoreNumber == 1) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Returns the Package (in the Deployment View) that owns the input system.
-	 *
-	 * @param umlModel the uml model
-	 * @param theSystem the the system
-	 * @return the owner CH ga resource platform package
-	 * @throws ModelError the model error
-	 */
-	public static Package getOwnerCHGaResourcePlatformPackage(Model umlModel, InstanceSpecification theSystem) throws ModelError {
-		EList<Package> packList = QueryUtils.getResourcePlatformPackages(umlModel, Constants.DEPLOYMENT_VIEW_NAME);
-		for (Package pack : packList) {
-			EList<Element> packElems = pack.allOwnedElements();
-			for (Element elem : packElems) {
-				if (elem instanceof InstanceSpecification) {
-					if (((InstanceSpecification) elem).equals(theSystem)) {
-						return pack;
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+/*------------------------------------------------------------------------------

+  -

+  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 

+  - All rights reserved. This program and the accompanying materials

+  - are made available under the terms of the Eclipse Public License v2.0

+  - which accompanies this distribution, and is available at

+  - http://www.eclipse.org/legal/epl-v20.html

+  -

+  - Contributors:

+  -

+  - Alessandro Zovi azovi@math.unipd.it

+  - Stefano Puri stefano.puri@intecs.it

+  - Laura Baracchi laura.baracchi@intecs.it

+  - Nicholas Pacini nicholas.pacini@intecs.it  

+  -

+  - Initial API and implementation and/or initial documentation

+  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.utils;

+

+import java.util.ArrayList;

+import java.util.HashMap;

+import java.util.HashSet;

+import java.util.LinkedHashSet;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Map;

+import java.util.Set;

+

+import javax.crypto.spec.OAEPParameterSpec;

+

+import org.eclipse.emf.common.command.CommandStack;

+import org.eclipse.emf.common.util.BasicEList;

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.common.util.Enumerator;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.emf.transaction.util.TransactionUtil;

+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.CallConcurrencyKind;

+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevice;

+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Assign;

+import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpConstraint;

+import org.eclipse.papyrus.uml.tools.model.UmlModel;

+import org.eclipse.uml2.uml.Activity;

+import org.eclipse.uml2.uml.ActivityNode;

+import org.eclipse.uml2.uml.CallOperationAction;

+import org.eclipse.uml2.uml.Classifier;

+import org.eclipse.uml2.uml.Comment;

+import org.eclipse.uml2.uml.Component;

+import org.eclipse.uml2.uml.Constraint;

+import org.eclipse.uml2.uml.Element;

+import org.eclipse.uml2.uml.InstanceSpecification;

+import org.eclipse.uml2.uml.LiteralString;

+import org.eclipse.uml2.uml.Model;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.Slot;

+import org.eclipse.uml2.uml.Stereotype;

+import org.eclipse.uml2.uml.UMLPackage;

+import org.eclipse.uml2.uml.ValueSpecification;

+import org.polarsys.chess.chessmlprofile.ComponentModel.ComponentImplementation;

+import org.polarsys.chess.chessmlprofile.ComponentModel.FunctionalPartition;

+import org.polarsys.chess.chessmlprofile.Core.CHESS;

+import org.polarsys.chess.chessmlprofile.Core.CHGaResourcePlatform;

+import org.polarsys.chess.chessmlprofile.Core.FunctionalPartitions;

+import org.polarsys.chess.chessmlprofile.Predictability.DeploymentConfiguration.HardwareBaseline.CH_HwProcessor;

+import org.polarsys.chess.chessmlprofile.Predictability.RTComponentModel.CHRtPortSlot;

+import org.polarsys.chess.chessmlprofile.Predictability.RTComponentModel.CHRtSpecification;

+import org.polarsys.chess.chessmlprofile.util.Constants;

+import org.polarsys.chess.core.profiles.CHESSProfileManager;

+import org.polarsys.chess.core.util.uml.ModelError;

+import org.polarsys.chess.core.util.uml.UMLUtils;

+import org.polarsys.chess.multicore.model.CHCore;

+import org.polarsys.chess.multicore.model.CHTask;

+import org.polarsys.chess.validator.constraints.StringParser;

+

+/**

+ * The Class QueryUtils.

+ */

+public class QueryUtils {

+	

+	/**

+	 * The Class OccKindInfo.

+	 */

+	public static class OccKindInfo {

+

+		/** The value. */

+		public double value;

+		

+		/** The type. */

+		public String type;

+		

+		/** The unit. */

+		public String unit;

+

+	}

+

+	/** The Constant MARTE_ASSIGN. */

+	private static final String MARTE_ASSIGN = "MARTE::MARTE_Foundations::Alloc::Assign";

+	

+	/** The Constant MARTE_NFPCONSTRAINT. */

+	private static final String MARTE_NFPCONSTRAINT = "MARTE::MARTE_Foundations::NFPs::NfpConstraint";

+

+	/** The Constant COMPONENT_TO_PARTITION. */

+	public static final int COMPONENT_TO_PARTITION = 0;

+	

+	/** The Constant PARTITION_TO_CORE. */

+	public static final int PARTITION_TO_CORE = 1;

+	

+	/** The Constant COMPONENT_TO_CORE. */

+	public static final int COMPONENT_TO_CORE = 2;

+	

+	/** The Constant TASK_TO_CORE. */

+	public static final int TASK_TO_CORE = 3;

+

+	/**

+	 * Gets the chess.

+	 *

+	 * @param umlModel the uml model

+	 * @return the chess

+	 */

+	public static CHESS getCHESS(Model umlModel) {

+		return UMLUtils.getStereotypeApplication(umlModel, CHESS.class);

+	}

+

+	/**

+	 * Gets the command stack.

+	 *

+	 * @param umlModel the uml model

+	 * @return the command stack

+	 */

+	public static CommandStack getCommandStack(Model umlModel) {

+		TransactionalEditingDomain editingDomain = TransactionUtil.getEditingDomain(umlModel);

+		return editingDomain.getCommandStack();

+	}

+

+	/**

+	 * returns the component which owns the assigns from components to partitions.

+	 *

+	 * @param umlModel the uml model

+	 * @return the partitions component

+	 * @throws ModelError the model error

+	 * @deprecated PartitionsComponent stereotype is deprecated

+	 */

+	public static Component getPartitionsComponent(Model umlModel) throws ModelError {

+		// assumption: assigns are stored in the root SW system i.e. the one

+		// stereotyped with CHGaResourcePlatform

+

+		CHESS chess = getCHESS(umlModel);

+		Package componentViewP = chess.getComponentView().getBase_Package();

+

+		for (Element el : componentViewP.allOwnedElements()) {

+			if (el instanceof Component) {

+				Component c = (Component) el;

+				// LB 20150707 Next line to be reviewed based on considerations about

+				// partitions' component

+				boolean b = c.getName().equalsIgnoreCase("Partitions");

+				b = b || UMLUtils.getStereotypeApplication(el, FunctionalPartitions.class) != null;

+				if (b)

+					return c;

+			}

+		}

+

+		throw new ModelError("Partitions component not found.");

+	}

+

+	

+	/**

+	 * Given a Partition returns the list of Components that are assigned to it.

+	 *

+	 * @param partition the partition

+	 * @param assignments the assignments

+	 * @return the components assigned 2 partition

+	 */

+	public static LinkedHashSet<Object> getComponentsAssigned2Partition(InstanceSpecification partition, EList<Assign> assignments) {

+		LinkedHashSet<Object> result = new LinkedHashSet<Object>();

+

+		for (Assign theAssignment : assignments) {

+			if (theAssignment != null) {

+				try {

+					if (theAssignment.getTo().contains((Object) partition) && (elementIsComponentInstance(theAssignment.getFrom().get(0)))) {

+						result.add(theAssignment.getFrom().get(0));

+					}

+				} catch (Exception e) {

+					// do nothing

+				}

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * Deletes all the associations of the given type.

+	 *

+	 * @param parent the parent

+	 * @param associationType (PARTITION_TO_CORE | COMPONENT_TO_CORE | TASK_TO_CORE | COMPONENT_TO_PARTITION

+	 */

+	public static void deleteAssociations(Component parent, int associationType) {

+		for (Object el : parent.getOwnedComments().toArray()) {

+			if (el instanceof Comment) {

+				Comment assignComment = (Comment) el;

+

+				Assign assign = UMLUtils.getStereotypeApplication(assignComment, Assign.class);

+				// Only delete one kind of associations

+				try {

+					if ((assign != null && associationType == PARTITION_TO_CORE && (elementIsPartitionInstance(assign.getFrom().get(0))))

+							|| (assign != null && associationType == COMPONENT_TO_CORE && (elementIsComponentInstance(assign.getFrom().get(0))) && (elementIsProcessorInstance(assign.getTo().get(0))))

+							|| (assign != null && associationType == TASK_TO_CORE && (elementIsSlotInstance(assign.getFrom().get(0))) && (elementIsProcessorInstance(assign.getTo().get(0))))

+							|| (assign != null && associationType == COMPONENT_TO_PARTITION && (elementIsComponentInstance(assign.getFrom().get(0))) && (elementIsPartitionInstance(assign.getTo().get(0))))) {

+						if (assign != null && assign.getImpliedConstraint().size() > 0) {

+							for (Object c : assign.getImpliedConstraint().toArray()) {

+								if (c instanceof NfpConstraint) {

+									NfpConstraint n = (NfpConstraint) c;

+									n.getBase_Constraint().destroy();

+								}

+							}

+						}

+						assignComment.destroy();

+					}

+				} catch (Exception e) {

+					// 20160225 Always delete assignments where one end is null!

+					assignComment.destroy();

+				}

+			}

+		}

+

+		// for (Object el : parent.getOwnedRules().toArray()) {

+		// if (el instanceof Constraint) {

+		// Constraint assignComment = (Constraint) el;

+		// assignComment.destroy();

+		// }

+		// }

+	}

+

+	/**

+	 * Returns the CHTask associated to the given element (if this is a CHRTPortSlot).

+	 *

+	 * @param element the element

+	 * @return task that corresponds to the input slot, if any

+	 */

+	public static CHTask getTaskFromSlot(Element element) {

+		if (!(element instanceof Slot)) {

+			return null;

+		}

+		Slot slot = (Slot) element;

+		CHRtPortSlot chSlot = UMLUtils.getStereotypeApplication(slot, CHRtPortSlot.class);

+		if (chSlot == null) {

+			return null;

+		}

+		EList<CHRtSpecification> chSpecs = chSlot.getCH_RtSpecification();

+		for (CHRtSpecification chRtSpecification : chSpecs) {

+			String occKind = chRtSpecification.getOccKind();

+			if (occKind != null && isOccKindSporadicOrPeriodic(occKind)) {

+				return new CHTask(chSlot, chRtSpecification);

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Returns all the CHTasks associated to the given element (if this is a CHRTPortSlot).

+	 *

+	 * @param element the element

+	 * @return task that corresponds to the input slot, if any

+	 */

+	private static EList<CHTask> getAllTasksFromSlot(Element element) {

+		EList<CHTask> chTaskList = new BasicEList<CHTask>();

+		if (!(element instanceof Slot)) {

+			return chTaskList;

+		}

+		Slot slot = (Slot) element;

+		CHRtPortSlot chSlot = UMLUtils.getStereotypeApplication(slot, CHRtPortSlot.class);

+		if (chSlot == null) {

+			return chTaskList;

+		}

+		EList<CHRtSpecification> chSpecs = chSlot.getCH_RtSpecification();

+		for (CHRtSpecification chRtSpecification : chSpecs) {

+			String occKind = chRtSpecification.getOccKind();

+			if (occKind != null && isOccKindSporadicOrPeriodic(occKind)) {

+				chTaskList.add(new CHTask(chSlot, chRtSpecification));

+				// return new CHTask(chSlot, chRtSpecification);

+			}

+		}

+		return chTaskList;

+	}

+

+	/**

+	 * Element is slot instance.

+	 *

+	 * @param element the element

+	 * @return true, if successful

+	 */

+	public static boolean elementIsSlotInstance(Element element) {

+		return element instanceof Slot;

+	}

+

+	/**

+	 * Given a component, create all the Component to Partition Assignments.

+	 *

+	 * @param parent the parent

+	 * @param result the result

+	 */

+	public static void buildComponent2PartitionAssignment(Component parent, Map<InstanceSpecification, LinkedHashSet<Object>> result) {

+		System.out.println(parent.getQualifiedName());

+

+		for (InstanceSpecification partitionInst : result.keySet()) {

+			System.out.println(partitionInst.getName());

+			for (Object o : result.get(partitionInst)) {

+				if (o instanceof InstanceSpecification) {

+					InstanceSpecification componentInst = (InstanceSpecification) o;

+					System.out.println(componentInst.getName());

+

+					Comment c = parent.createOwnedComment();

+					UMLUtils.applyStereotype(c, MARTE_ASSIGN);

+					Assign assign = UMLUtils.getStereotypeApplication(c, Assign.class);

+					assign.getFrom().add(componentInst);

+					assign.getTo().add(partitionInst);

+				}

+			}

+		}

+	}

+

+	/**

+	 * Builds the core name.

+	 *

+	 * @param coreNumber the core number

+	 * @return the string

+	 */

+	public static String buildCoreName(int coreNumber) {

+		/* coreNumber starts from 0 */

+		return "core" + coreNumber;

+	}

+

+	/**

+	 * Create all the Partition to Core Assignments.

+	 *

+	 * @param parent the parent

+	 * @param result the result

+	 */

+	public static void buildPartition2CoreAssignments(Component parent, Map<CHCore, LinkedHashSet<Object>> result) {

+		for (CHCore core : result.keySet()) {

+			for (Object o : result.get(core)) {

+				if (o instanceof InstanceSpecification) {

+					InstanceSpecification partitionInst = (InstanceSpecification) o;

+					Comment c = parent.createOwnedComment();

+					UMLUtils.applyStereotype(c, MARTE_ASSIGN);

+					Assign assign = UMLUtils.getStereotypeApplication(c, Assign.class);

+					assign.getFrom().add(partitionInst);

+					assign.getTo().add(core.getProcessorInstance());

+

+					Constraint n = parent.createOwnedRule(core.getName());

+					UMLUtils.applyStereotype(n, MARTE_NFPCONSTRAINT);

+					NfpConstraint rule = UMLUtils.getStereotypeApplication(n, NfpConstraint.class);

+

+					ValueSpecification valueSpec = n.createSpecification("core", null, UMLPackage.Literals.LITERAL_STRING);

+					LiteralString value = (LiteralString) valueSpec;

+					value.setValue(core.getName());

+					assign.getImpliedConstraint().add(rule);

+				}

+			}

+		}

+	}

+

+	/**

+	 * Returns the first CHGaResourcePlatform that is found inside the given package.

+	 *

+	 * @param cmpv the cmpv

+	 * @return the one resource platform package

+	 */

+	public static Package getOneResourcePlatformPackage(Package cmpv) {

+		/* breath-first search */

+		final LinkedList<Package> breadthFirstList = new LinkedList<Package>();

+		breadthFirstList.addFirst(cmpv);

+		while (!breadthFirstList.isEmpty()) {

+			final Package candidate = breadthFirstList.poll();

+

+			CHGaResourcePlatform a = UMLUtils.getStereotypeApplication(candidate, CHGaResourcePlatform.class);

+

+			if (a != null)

+				return candidate;

+

+			for (final Package p : candidate.getNestedPackages()) {

+				breadthFirstList.addLast(p);

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Gets the resource platform package.

+	 *

+	 * @param cmpv the cmpv

+	 * @return the resource platform package

+	 * @deprecated This method returns only one platform package. In the newer

+	 *             version of CHESS there can be multiple platform packages.

+	 *             Replace with getResourcePlatformPackages

+	 */

+	@Deprecated

+	public static Package getResourcePlatformPackage(Package cmpv) {

+		/* breath-first search */

+		final LinkedList<Package> breadthFirstList = new LinkedList<Package>();

+		breadthFirstList.addFirst(cmpv);

+		while (!breadthFirstList.isEmpty()) {

+			final Package candidate = breadthFirstList.poll();

+

+			CHGaResourcePlatform a = UMLUtils.getStereotypeApplication(candidate, CHGaResourcePlatform.class);

+

+			if (a != null)

+				return candidate;

+

+			for (final Package p : candidate.getNestedPackages()) {

+				breadthFirstList.addLast(p);

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Returns the list of CHGaResourcePlatforms found inside the view with the given name in the given model.

+	 *

+	 * @param umlModel the uml model

+	 * @param viewName the view name

+	 * @return the resource platform packages

+	 * @throws ModelError the model error

+	 */

+	public static EList<Package> getResourcePlatformPackages(Model umlModel, String viewName) throws ModelError {

+

+		Package pack = CHESSProfileManager.getViewByStereotype((Model) umlModel, viewName);

+

+		if (pack == null)

+			throw new ModelError(viewName + " not found.");

+		// Package cmpv

+		/* breath-first search */

+

+		EList<Package> result = new BasicEList<Package>();

+

+		final LinkedList<Package> breadthFirstList = new LinkedList<Package>();

+		breadthFirstList.addFirst(pack);

+		while (!breadthFirstList.isEmpty()) {

+			final Package candidate = breadthFirstList.poll();

+

+			CHGaResourcePlatform a = UMLUtils.getStereotypeApplication(candidate, CHGaResourcePlatform.class);

+

+			if (a != null)

+				result.add(candidate);

+			// return candidate;

+

+			for (final Package p : candidate.getNestedPackages()) {

+				breadthFirstList.addLast(p);

+			}

+		}

+		return result;

+		// return null;

+	}

+

+	/**

+	 * Returns the list of CHGaResourcePlatforms found inside the given Package.

+	 *

+	 * @param cmpv is the given package

+	 * @return the resource platform packages

+	 */

+	public static List<Package> getResourcePlatformPackages(Package cmpv) {

+		List<Package> candidates = new ArrayList<Package>();

+		/* breath-first search */

+		final LinkedList<Package> breadthFirstList = new LinkedList<Package>();

+		breadthFirstList.addFirst(cmpv);

+		while (!breadthFirstList.isEmpty()) {

+			final Package candidate = breadthFirstList.poll();

+

+			CHGaResourcePlatform a = UMLUtils.getStereotypeApplication(candidate, CHGaResourcePlatform.class);

+

+			if (a != null)

+				candidates.add(candidate);

+

+			for (final Package p : candidate.getNestedPackages()) {

+				breadthFirstList.addLast(p);

+			}

+		}

+		return candidates;

+	}

+

+	/**

+	 * Returns a Component that is stereotyped as CHGaResourcePlatform inside the view with the given name 

+	 * in the given model.

+	 *

+	 * @param umlModel the uml model

+	 * @param viewName the view name

+	 * @return the resource platform component

+	 * @throws ModelError the model error

+	 */

+	public static Component getResourcePlatformComponent(Model umlModel, String viewName) throws ModelError {

+		Package parent = CHESSProfileManager.getViewByStereotype(umlModel, viewName);

+

+		if (parent == null)

+			throw new ModelError(viewName + " not found.");

+

+		/* breath-first search */

+		final LinkedList<Element> breadthFirstList = new LinkedList<Element>();

+

+		breadthFirstList.addAll(parent.getOwnedElements());

+		while (!breadthFirstList.isEmpty()) {

+			final Element t = breadthFirstList.poll();

+

+			if (t instanceof Component) {

+				Component candidate = (Component) t;

+				CHGaResourcePlatform a = UMLUtils.getStereotypeApplication(candidate, CHGaResourcePlatform.class);

+				if (a != null)

+					return candidate;

+			}

+			for (final Element e : t.getOwnedElements()) {

+				breadthFirstList.addLast(e);

+			}

+		}

+

+		throw new ModelError("CHGaResourcePlatform not found in " + viewName + " view.");

+	}

+

+	/**

+	 * Returns true if the given InstanceSpecification is a functional Partition, false otherwise.

+	 *

+	 * @param e the e

+	 * @return true, if is partition instance

+	 */

+	public static boolean isPartitionInstance(InstanceSpecification e) {

+		for (Classifier c : e.getClassifiers()) {

+

+			if (UMLUtils.getStereotypeApplication(c, FunctionalPartition.class) != null)

+				return true;

+

+		}

+		return false;

+	}

+

+	/**

+	 * Returns true if the given InstanceSpecification is a ComponentImplementation, false otherwise.

+	 *

+	 * @param e the e

+	 * @return true, if is component instance

+	 */

+	public static boolean isComponentInstance(InstanceSpecification e) {

+		for (Classifier c : e.getClassifiers()) {

+			if (UMLUtils.getStereotypeApplication(c, ComponentImplementation.class) != null)

+				return true;

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if is guarded.

+	 *

+	 * @param spec the spec

+	 * @return true, if is guarded

+	 */

+	public static boolean isGuarded(CHRtSpecification spec) {

+		return spec.getProtection().getName().equals(CallConcurrencyKind.GUARDED.getName());

+	}

+

+	/**

+	 * Checks if is occ kind sporadic or periodic.

+	 *

+	 * @param occKind the occ kind

+	 * @return true, if is occ kind sporadic or periodic

+	 */

+	public static boolean isOccKindSporadicOrPeriodic(String occKind) {

+		if (occKind == null)

+			return false;

+		return isOccKindSporadic(occKind) || isOccKindPeriodic(occKind);

+	}

+

+	/**

+	 * Checks if is occ kind sporadic.

+	 *

+	 * @param occKind the occ kind

+	 * @return true, if is occ kind sporadic

+	 */

+	public static boolean isOccKindSporadic(String occKind) {

+		String t = occKind.toLowerCase();

+		return t.matches(".*sporadic.*");

+	}

+

+	/**

+	 * Checks if is occ kind periodic.

+	 *

+	 * @param occKind the occ kind

+	 * @return true, if is occ kind periodic

+	 */

+	public static boolean isOccKindPeriodic(String occKind) {

+		String t = occKind.toLowerCase();

+		return t.matches(".*periodic.*");

+	}

+

+	/**

+	 * Returns the OccKindInfo that correspomnds to the input string.

+	 *

+	 * @param occKind the String with the occurrency kind information

+	 * @return OccKindInfo

+	 */

+	public static OccKindInfo getOccKindInfo(String occKind) {

+		StringParser sp = new StringParser();

+		OccKindInfo info = new OccKindInfo();

+		if (isOccKindSporadic(occKind)) {

+			info.value = sp.getValuePattern(occKind, "minInterarrival");

+			info.type = "sporadic";

+			info.unit = sp.getUnitPattern(occKind, "minInterarrival");

+		} else if (occKind.toLowerCase().matches(".*periodic.*")) {

+			info.value = sp.getValuePattern(occKind, "period");

+			info.unit = sp.getUnitPattern(occKind, "period");

+			info.type = "periodic";

+		} else {

+			return null;

+		}

+

+		return info;

+	}

+

+	/**

+	 * Returns a map with the Component to Partition assignments.

+	 *

+	 * @param umlModel the uml model

+	 * @param parent the parent

+	 * @return the map

+	 * @throws ModelError the model error

+	 */

+	public static Map<InstanceSpecification, Set<CHRtSpecification>> buildPartitionComponentMap(Model umlModel, Package parent) throws ModelError {

+		Map<InstanceSpecification, Set<CHRtSpecification>> map = new HashMap<InstanceSpecification, Set<CHRtSpecification>>();

+

+		EList<Assign> assignmentList = UMLUtils.getComponent2PartitionAssignments(umlModel, CHESSProfileManager.COMPONENT_VIEW);

+		if (!assignmentList.isEmpty()) {

+			for (Assign assign : assignmentList) {

+				if (assign == null)

+					continue;

+				for (Element i : assign.getFrom()) {

+					if (i instanceof InstanceSpecification) {

+						InstanceSpecification ii = (InstanceSpecification) i;

+						processComponentInstance(map, assign, ii);

+					}

+				}

+

+			}

+		}

+

+		return map;

+	}

+

+	/**

+	 * Returns a map with the Partition to Core assignments.

+	 *

+	 * @param umlModel the uml model

+	 * @return the map

+	 * @throws ModelError the model error

+	 */

+	public static Map<String, Set<InstanceSpecification>> buildPartitionCoreMap(Model umlModel) throws ModelError {

+		Map<String, Set<InstanceSpecification>> map = new HashMap<String, Set<InstanceSpecification>>();

+

+		EList<Assign> assignmentList = UMLUtils.getPartition2CoreAssignments(umlModel, CHESSProfileManager.DEPLOYMENT_VIEW);

+		if (!assignmentList.isEmpty()) {

+			for (Assign assign : assignmentList) {

+

+				for (Element i : assign.getFrom()) {

+					if (i instanceof InstanceSpecification) {

+						processPartitionInstance(map, assign);

+					}

+				}

+

+			}

+		}

+		return map;

+	}

+

+	// public static Map<InstanceSpecification, Set<CHRtSpecification>>

+	// buildPartitionComponentMap(Component parent) {

+	// Map<InstanceSpecification, Set<CHRtSpecification>> map = new

+	// HashMap<InstanceSpecification, Set<CHRtSpecification>>();

+	// for (Comment el : parent.getOwnedComments()) {

+	//

+	// Comment assignComment = (Comment) el;

+	// Assign assign = UMLUtils.getStereotypeApplication(assignComment,

+	// Assign.class);

+	// if (assign == null)

+	// continue;

+	// for (Element i : assign.getFrom()) {

+	// if (i instanceof InstanceSpecification) {

+	// InstanceSpecification ii = (InstanceSpecification) i;

+	// processComponentInstance(map, assign, ii);

+	// }

+	// }

+	//

+	// }

+	// return map;

+	// }

+

+	/**

+	 * Process partition instance.

+	 *

+	 * @param map the map

+	 * @param assign the assign

+	 */

+	private static void processPartitionInstance(Map<String, Set<InstanceSpecification>> map, Assign assign) {

+

+		try {

+			if (assign.getImpliedConstraint().size() > 0) {

+				for (Object c : assign.getImpliedConstraint().toArray()) {

+					if (c instanceof NfpConstraint) {

+						ValueSpecification x = ((NfpConstraint) c).getBase_Constraint().getSpecification();

+						if (x instanceof LiteralString) {

+							LiteralString s = (LiteralString) x;

+							String coreName = ((NamedElement) assign.getTo().get(0)).getName() + s.getValue();

+							InstanceSpecification part = (InstanceSpecification) assign.getFrom().get(0);

+

+							Set<InstanceSpecification> value = map.get(coreName);

+							if (value == null)

+								value = new HashSet<InstanceSpecification>();

+							value.add(part);

+							map.put(coreName, value);

+						}

+					}

+

+				}

+			}

+		} catch (Exception e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		}

+

+	}

+

+	/**

+	 * Process component instance.

+	 *

+	 * @param map the map

+	 * @param assign the assign

+	 * @param instanceSpec the instance spec

+	 */

+	private static void processComponentInstance(Map<InstanceSpecification, Set<CHRtSpecification>> map, Assign assign, InstanceSpecification instanceSpec) {

+

+		for (Element element : instanceSpec.getOwnedElements()) {

+			if (element instanceof Slot) {

+				Slot slot = (Slot) element;

+				CHRtPortSlot chSlot = UMLUtils.getStereotypeApplication(slot, CHRtPortSlot.class);

+				if (chSlot != null) {

+					EList<CHRtSpecification> chSpecs = chSlot.getCH_RtSpecification();

+

+					addToMap(map, assign.getTo(), chSpecs);

+				}

+			}

+		}

+	}

+

+	/**

+	 * Adds the to map.

+	 *

+	 * @param map the map

+	 * @param to the to

+	 * @param chSpecs the ch specs

+	 */

+	/* add only periodic or sporadic components */

+	private static void addToMap(Map<InstanceSpecification, Set<CHRtSpecification>> map, EList<Element> to, EList<CHRtSpecification> chSpecs) {

+		for (Element partition : to) {

+			if (partition instanceof InstanceSpecification) {

+				InstanceSpecification p = (InstanceSpecification) partition;

+				for (CHRtSpecification chRtSpecification : chSpecs) {

+					String occKind = chRtSpecification.getOccKind();

+					if (occKind != null) {

+						if (isOccKindSporadicOrPeriodic(occKind)) {

+							addToMap(map, p, chRtSpecification);

+						}

+					}

+				}

+			}

+		}

+	}

+

+	

+	/**

+	 * Adds the to map.

+	 *

+	 * @param map the map

+	 * @param p the p

+	 * @param chRtSpecification the ch rt specification

+	 */

+	private static void addToMap(Map<InstanceSpecification, Set<CHRtSpecification>> map, InstanceSpecification p, CHRtSpecification chRtSpecification) {

+		Set<CHRtSpecification> value = map.get(p);

+		if (value == null)

+			value = new HashSet<CHRtSpecification>();

+		value.add(chRtSpecification);

+		map.put(p, value);

+

+	}

+

+	

+	/**

+	 * Returns true if the given InstanceSpecification is sterotyped as CH_HwProcessor.

+	 *

+	 * @param e the e

+	 * @return true, if is processor instance

+	 */

+	public static boolean isProcessorInstance(InstanceSpecification e) {

+		for (Classifier c : e.getClassifiers()) {

+			if (UMLUtils.getStereotypeApplication(c, CH_HwProcessor.class) != null)

+				return true;

+		}

+		return false;

+	}

+

+	/**

+	 * check if an instance specification is an instance of a MARTE Device.

+	 *

+	 * @param instSpec the inst spec

+	 * @return true if the input is an instance of a MARTE Device, false

+	 *         otherwise.

+	 */

+	public static boolean isDeviceInstance(InstanceSpecification instSpec) {

+		Classifier classifier = instSpec.getClassifiers().get(0);

+		EList<Stereotype> stereotypeList = classifier.getAppliedStereotypes();

+		for (Stereotype theStereo : stereotypeList) {

+			EObject object = classifier.getStereotypeApplication(theStereo);

+			if (object instanceof HwDevice) {

+				return true;

+			}

+		}

+

+		return false;

+	}

+

+	/**

+	 * Gets the one processor.

+	 *

+	 * @param umlModel the uml model

+	 * @return the one processor

+	 */

+	public static CH_HwProcessor getOneProcessor(Model umlModel) {

+		Package depv = CHESSProfileManager.getViewByStereotype((Model) umlModel, CHESSProfileManager.DEPLOYMENT_VIEW);

+		depv = QueryUtils.getOneResourcePlatformPackage(depv);

+		if (depv != null) {

+			EList<Element> all = depv.allOwnedElements();

+			for (Element element : all) {

+				if (element instanceof InstanceSpecification) {

+					InstanceSpecification e = (InstanceSpecification) element;

+					if (e.getQualifiedName() != null && QueryUtils.isProcessorInstance(e)) {

+						CH_HwProcessor t = UMLUtils.getStereotypeApplication(e, CH_HwProcessor.class);

+						return t;

+					}

+				}

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Gets the all processor instances.

+	 *

+	 * @param umlModel the uml model

+	 * @return the all processor instances

+	 * @throws ModelError the model error

+	 */

+	public static EList<CH_HwProcessor> getAllProcessorInstances(Model umlModel) throws ModelError {

+		EList<CH_HwProcessor> processors = new BasicEList<CH_HwProcessor>();

+		Package depv = CHESSProfileManager.getViewByStereotype((Model) umlModel, CHESSProfileManager.DEPLOYMENT_VIEW);

+

+		if (depv == null)

+			throw new ModelError("Deployment view not found.");

+

+		List<Package> platformPackages = QueryUtils.getResourcePlatformPackages(depv);

+

+		if (platformPackages.isEmpty())

+			throw new ModelError("CHGaResourcePlatform not found in Deployment view.");

+

+		for (Package pp : platformPackages) {

+			EList<Element> all = pp.allOwnedElements();

+			for (Element element : all) {

+				if (element instanceof InstanceSpecification) {

+					InstanceSpecification e = (InstanceSpecification) element;

+					if (e.getQualifiedName() != null && QueryUtils.isProcessorInstance(e)) {

+						CH_HwProcessor t = UMLUtils.getStereotypeApplication(e, CH_HwProcessor.class);

+						processors.add(t);

+					}

+				}

+			}

+		}

+

+		if (processors.size() == 0)

+			throw new ModelError("Processors not found.");

+

+		return processors;

+	}

+

+	/**

+	 * Gets the all processor instances in package.

+	 *

+	 * @param thePackage the the package

+	 * @return the all processor instances in package

+	 * @throws ModelError the model error

+	 */

+	public static EList<CH_HwProcessor> getAllProcessorInstancesInPackage(Package thePackage) throws ModelError {

+		EList<CH_HwProcessor> processors = new BasicEList<CH_HwProcessor>();

+

+		EList<Element> all = thePackage.allOwnedElements();

+		for (Element element : all) {

+			if (element instanceof InstanceSpecification) {

+				InstanceSpecification e = (InstanceSpecification) element;

+				if (e.getQualifiedName() != null && QueryUtils.isProcessorInstance(e)) {

+					CH_HwProcessor t = UMLUtils.getStereotypeApplication(e, CH_HwProcessor.class);

+					processors.add(t);

+				}

+			}

+		}

+		if (processors.size() == 0)

+			throw new ModelError("Processors not found.");

+

+		return processors;

+	}

+

+	

+	/**

+	 * Filter multi core processors.

+	 *

+	 * @param processors the processors

+	 * @return the e list

+	 */

+	public static EList<CH_HwProcessor> filterMultiCoreProcessors(EList<CH_HwProcessor> processors) {

+		EList<CH_HwProcessor> candidates = new BasicEList<CH_HwProcessor>();

+		for (CH_HwProcessor processor : processors) {

+			if (getCores(processor).size() > 1)

+				candidates.add(processor);

+		}

+		return candidates;

+

+	}

+

+	

+	/**

+	 * Gets the cores.

+	 *

+	 * @param processor the processor

+	 * @return the cores

+	 */

+	public static EList<CHCore> getCores(CH_HwProcessor processor) {

+		InstanceSpecification processorBaseInst = processor.getBase_InstanceSpecification();

+		Component processorComponent = (Component) processorBaseInst.getClassifiers().get(0);

+

+		Stereotype chHwProcessorStereo = processorComponent.getAppliedStereotype(Constants.CH_HWPROCESSOR);

+		CH_HwProcessor chHwProc = (CH_HwProcessor) processorComponent.getStereotypeApplication(chHwProcessorStereo);

+

+		String coreNumber = null;

+		coreNumber = chHwProc.getNbCores();

+		int icoreNumber = 1;

+		try {

+			icoreNumber = Integer.parseInt(coreNumber);

+		} catch (Exception e) {

+			icoreNumber = 1;

+		}

+		EList<CHCore> cores = new BasicEList<CHCore>();

+		for (int i = 0; i < icoreNumber; i++) {

+			cores.add(new CHCore(processor, QueryUtils.buildCoreName(i)));

+		}

+		return cores;

+	}

+

+	

+	/**

+	 * Gets the all partition instances.

+	 *

+	 * @param umlModel the uml model

+	 * @return the all partition instances

+	 * @throws ModelError the model error

+	 */

+	public static EList<InstanceSpecification> getAllPartitionInstances(Model umlModel) throws ModelError {

+

+		Package cmpv = CHESSProfileManager.getViewByStereotype(umlModel, CHESSProfileManager.COMPONENT_VIEW);

+

+		if (cmpv == null)

+			throw new ModelError("Component view not found.");

+

+		cmpv = QueryUtils.getOneResourcePlatformPackage(cmpv);

+

+		if (cmpv == null)

+			throw new ModelError("CHGaResourcePlatform not found in Component View.");

+

+		EList<Element> all = cmpv.allOwnedElements();

+		EList<InstanceSpecification> partitions = new BasicEList<InstanceSpecification>();

+		for (Element element : all) {

+			if (!(element instanceof InstanceSpecification))

+				continue;

+

+			InstanceSpecification is = (InstanceSpecification) element;

+

+			if (!(is.getQualifiedName() != null && QueryUtils.isPartitionInstance(is)))

+				continue;

+			partitions.add(is);

+		}

+

+		if (partitions.size() == 0)

+			throw new ModelError("Partition Instances not found.");

+

+		return partitions;

+	}

+

+	

+	/**

+	 * Gets the all component instances.

+	 *

+	 * @param umlModel the uml model

+	 * @return the all component instances

+	 * @throws ModelError the model error

+	 */

+	public static EList<InstanceSpecification> getAllComponentInstances(Model umlModel) throws ModelError {

+

+		Package cmpv = CHESSProfileManager.getViewByStereotype(umlModel, CHESSProfileManager.COMPONENT_VIEW);

+

+		if (cmpv == null)

+			throw new ModelError("Component view not found.");

+

+		cmpv = QueryUtils.getOneResourcePlatformPackage(cmpv);

+

+		if (cmpv == null)

+			throw new ModelError("CHGaResourcePlatform not found in Component View.");

+

+		EList<Element> all = cmpv.allOwnedElements();

+		EList<InstanceSpecification> components = new BasicEList<InstanceSpecification>();

+		for (Element element : all) {

+			if (!(element instanceof InstanceSpecification))

+				continue;

+

+			InstanceSpecification is = (InstanceSpecification) element;

+

+			if (!(is.getQualifiedName() != null && QueryUtils.isComponentInstance(is)))

+				continue;

+			components.add(is);

+

+		}

+		if (components.size() == 0)

+			throw new ModelError("Component Instances not found.");

+

+		return components;

+	}

+

+	

+	/**

+	 * Gets the all task instances.

+	 *

+	 * @param umlModel the uml model

+	 * @return the all task instances

+	 * @throws ModelError the model error

+	 */

+	public static EList<CHTask> getAllTaskInstances(Model umlModel) throws ModelError {

+

+		EList<CHTask> tasks = new BasicEList<CHTask>();

+

+		EList<InstanceSpecification> x = getAllComponentInstances(umlModel);

+		for (InstanceSpecification instanceSpecification : x) {

+			for (Element element1 : instanceSpecification.getOwnedElements()) {

+

+				if (!(element1 instanceof Slot))

+					continue;

+

+				Slot slot = (Slot) element1;

+				CHRtPortSlot chSlot = UMLUtils.getStereotypeApplication(slot, CHRtPortSlot.class);

+				if (chSlot == null)

+					continue;

+

+				EList<CHRtSpecification> chSpecs = chSlot.getCH_RtSpecification();

+

+				for (CHRtSpecification chRtSpecification : chSpecs) {

+					tasks.add(new CHTask(chSlot, chRtSpecification));

+				}

+			}

+		}

+		if (tasks.size() == 0)

+			throw new ModelError("Tasks Instances not found.");

+

+		return tasks;

+	}

+

+	/**

+	 * Delete task 2 core associations.

+	 *

+	 * @param hwSystem the hw system

+	 */

+	public static void deleteTask2CoreAssociations(Component hwSystem) {

+		deleteAssociations(hwSystem, TASK_TO_CORE);

+	}

+

+	/**

+	 * Delete component 2 core associations.

+	 *

+	 * @param hwSystem the hw system

+	 */

+	public static void deleteComponent2CoreAssociations(Component hwSystem) {

+		deleteAssociations(hwSystem, COMPONENT_TO_CORE);

+	}

+

+	/**

+	 * Delete partition 2 core associations.

+	 *

+	 * @param hwSystem the hw system

+	 */

+	public static void deletePartition2CoreAssociations(Component hwSystem) {

+		deleteAssociations(hwSystem, PARTITION_TO_CORE);

+	}

+

+	

+	/**

+	 * Builds the instance 2 core assignments.

+	 *

+	 * @param hwSystem the hw system

+	 * @param result the result

+	 */

+	public static void buildInstance2CoreAssignments(Component hwSystem, Map<CHCore, LinkedHashSet<Object>> result) {

+

+		for (CHCore core : result.keySet()) {

+			for (Object o : result.get(core)) {

+				if (o instanceof InstanceSpecification) {

+					InstanceSpecification componentInst = (InstanceSpecification) o;

+					Comment c = hwSystem.createOwnedComment();

+					UMLUtils.applyStereotype(c, MARTE_ASSIGN);

+					Assign assign = UMLUtils.getStereotypeApplication(c, Assign.class);

+					assign.getFrom().add(componentInst);

+					assign.getTo().add(core.getProcessorInstance());

+

+					Constraint n = hwSystem.createOwnedRule(core.getName());

+					UMLUtils.applyStereotype(n, MARTE_NFPCONSTRAINT);

+					NfpConstraint rule = UMLUtils.getStereotypeApplication(n, NfpConstraint.class);

+

+					ValueSpecification valueSpec = n.createSpecification("core", null, UMLPackage.Literals.LITERAL_STRING);

+					LiteralString value = (LiteralString) valueSpec;

+					value.setValue(core.getName());

+					assign.getImpliedConstraint().add(rule);

+				}

+			}

+		}

+	}

+

+	

+	/**

+	 * Gets the CHRT spec from instances.

+	 *

+	 * @param instances the instances

+	 * @return the CHRT spec from instances

+	 */

+	public static Set<CHRtSpecification> getCHRTSpecFromInstances(EList<InstanceSpecification> instances) {

+

+		Set<CHRtSpecification> result = new HashSet<CHRtSpecification>();

+

+		for (InstanceSpecification is : instances) {

+			for (Element el : is.getOwnedElements()) {

+				if (!(el instanceof Slot))

+					continue;

+

+				Slot slot = (Slot) el;

+				CHRtPortSlot chSlot = UMLUtils.getStereotypeApplication(slot, CHRtPortSlot.class);

+				if (chSlot == null)

+					continue;

+

+				EList<CHRtSpecification> chSpecs = chSlot.getCH_RtSpecification();

+				for (CHRtSpecification chRtSpecification : chSpecs) {

+					String occKind = chRtSpecification.getOccKind();

+					if (occKind != null && isOccKindSporadicOrPeriodic(occKind)) {

+						result.add(chRtSpecification);

+					}

+				}

+			}

+		}

+

+		return result;

+	}

+

+	/**

+	 * Gets the CH tasks.

+	 *

+	 * @param instances the instances

+	 * @return the CH tasks

+	 */

+	public static Map<CHRtSpecification, Slot> getCHTasks(EList<InstanceSpecification> instances) {

+

+		Map<CHRtSpecification, Slot> result = new HashMap<CHRtSpecification, Slot>();

+

+		for (InstanceSpecification is : instances) {

+			for (Element el : is.getOwnedElements()) {

+

+				if (!(el instanceof Slot))

+					continue;

+

+				Slot slot = (Slot) el;

+				CHRtPortSlot chSlot = UMLUtils.getStereotypeApplication(slot, CHRtPortSlot.class);

+				if (chSlot == null)

+					continue;

+

+				EList<CHRtSpecification> chSpecs = chSlot.getCH_RtSpecification();

+				for (CHRtSpecification chRtSpecification : chSpecs) {

+					String occKind = chRtSpecification.getOccKind();

+					if (occKind != null) {

+						if (isOccKindSporadicOrPeriodic(occKind)) {

+							result.put(chRtSpecification, slot);

+						}

+					}

+				}

+			}

+		}

+

+		return result;

+	}

+

+	

+	/**

+	 * Gets the CH tasks list.

+	 *

+	 * @param instances the instances

+	 * @return the CH tasks list

+	 */

+	public static EList<CHTask> getCHTasksList(EList<InstanceSpecification> instances) {

+

+		EList<CHTask> result = new BasicEList<CHTask>();

+

+		for (InstanceSpecification is : instances) {

+			for (Element el : is.getOwnedElements()) {

+

+				if (!(el instanceof Slot))

+					continue;

+

+				Slot slot = (Slot) el;

+				CHRtPortSlot chSlot = UMLUtils.getStereotypeApplication(slot, CHRtPortSlot.class);

+				if (chSlot == null)

+					continue;

+

+				EList<CHRtSpecification> chSpecs = chSlot.getCH_RtSpecification();

+				for (CHRtSpecification chRtSpecification : chSpecs) {

+					String occKind = chRtSpecification.getOccKind();

+					if (occKind != null && isOccKindSporadicOrPeriodic(occKind)) {

+						result.add(new CHTask(chSlot, chRtSpecification));

+					}

+				}

+			}

+		}

+

+		return result;

+	}

+

+	/**

+	 * Builds the task 2 core assignments.

+	 *

+	 * @param hwSystem the hw system

+	 * @param processor the processor

+	 * @param coresToCHRtSpec the cores to CH rt spec

+	 * @param mapCHRtSpecToInstances the map CH rt spec to instances

+	 */

+	public static void buildTask2CoreAssignments(Component hwSystem, InstanceSpecification processor, Map<String, LinkedHashSet<CHRtSpecification>> coresToCHRtSpec,

+			Map<CHRtSpecification, InstanceSpecification> mapCHRtSpecToInstances) {

+		// TODO Auto-generated method stub

+

+	}

+

+	/**

+	 * Gets the operation chain.

+	 *

+	 * @param umlModel the uml model

+	 * @param chtasks the chtasks

+	 * @return the operation chain

+	 * @throws ModelError the model error

+	 */

+	/*

+	 * foreach deferred op get its slot in the instance package get its activity

+	 * diagram if any collect the called operations get the corresponding

+	 * component and so its specification

+	 * 

+	 * this is useful to calculate the WCET of the task generated from the

+	 * deferred op

+	 */

+	public static HashMap<CHTask, EList<CHTask>> getOperationChain(Model umlModel, EList<CHTask> chtasks) throws ModelError {

+		Package instPkg = InstanceQuery.getInstanceSpecPackage(umlModel);

+		if (instPkg == null) {

+			throw new ModelError("Instance package not in the model: use the create instance command to create this package");

+		}

+		HashMap<CHTask, EList<CHTask>> map = new HashMap<CHTask, EList<CHTask>>();

+		for (CHTask dOp : chtasks) {

+			System.out.println(dOp.getCHRtSpecification().getContext().getName());

+			EList<CHTask> list = new BasicEList<CHTask>();

+			CHRtPortSlot chRtPortSlot = InstanceQuery.getCHRtPortSlot(instPkg, dOp.getCHRtSpecification());

+			slot2EndToEndWorkFlow(instPkg, chRtPortSlot, dOp.getCHRtSpecification(), list);

+			map.put(dOp, list);

+		}

+		return map;

+	}

+

+	/**

+	 * Gets the operation chain 2.

+	 *

+	 * @param umlModel the uml model

+	 * @param chtasks the chtasks

+	 * @return the operation chain 2

+	 * @throws ModelError the model error

+	 */

+	public static HashMap<CHRtSpecification, EList<CHTask>> getOperationChain2(Model umlModel, Set<CHRtSpecification> chtasks) throws ModelError {

+		Package instPkg = InstanceQuery.getInstanceSpecPackage(umlModel);

+		if (instPkg == null) {

+			throw new ModelError("Instance package not in the model: use the create instance command to create this package");

+		}

+		HashMap<CHRtSpecification, EList<CHTask>> map = new HashMap<CHRtSpecification, EList<CHTask>>();

+		for (CHRtSpecification dOp : chtasks) {

+			System.out.println(dOp.getContext().getName());

+			EList<CHTask> list = new BasicEList<CHTask>();

+			CHRtPortSlot chRtPortSlot = InstanceQuery.getCHRtPortSlot(instPkg, dOp);

+			slot2EndToEndWorkFlow(instPkg, chRtPortSlot, dOp, list);

+			map.put(dOp, list);

+		}

+		return map;

+	}

+

+	

+	/**

+	 * Slot 2 end to end work flow.

+	 *

+	 * @param instPkg the inst pkg

+	 * @param currentChSlot the current ch slot

+	 * @param dOp the d op

+	 * @param list the list

+	 * @throws ModelError the model error

+	 */

+	private static void slot2EndToEndWorkFlow(Package instPkg, CHRtPortSlot currentChSlot, CHRtSpecification dOp, EList<CHTask> list) throws ModelError {

+

+		InstanceSpecification owningInstance = currentChSlot.getBase_Slot().getOwningInstance();

+		Activity method = InstanceQuery.getMethod(dOp);

+		if (method == null)

+			return;// TODO throw exception?

+		for (ActivityNode node : method.getNodes()) {

+			if (node instanceof CallOperationAction) {

+				CallOperationAction callOp = (CallOperationAction) node;

+				EList<Slot> riSlot = InstanceQuery.getSlotFromPort(callOp, owningInstance);

+				for (Slot slot : riSlot) {

+					Slot usedPiSlot = InstanceQuery.getOppositeSlot(slot);

+					CHRtSpecification usedCH = InstanceQuery.getCHFromSlot(usedPiSlot, callOp.getOperation());

+					CHRtPortSlot ch = UMLUtils.getStereotypeApplication(usedPiSlot, CHRtPortSlot.class);

+					if (!InstanceQuery.isDeferred(usedCH)) {

+						list.add(new CHTask(ch, usedCH));

+						slot2EndToEndWorkFlow(instPkg, ch, usedCH, list);

+					}

+					//

+					// Operation operation = callOp.getOperation();//=>use to match the

+					// context of the chrtspec

+					// Port riPort = callOp.getOnPort();//=>get link and then pi then

+					// chrtspec

+					// Port piPort = getOppositePort(riPort);

+					// getCHRtCommentsfromPort(piPort, operation);

+				}

+

+			}

+		}

+	}

+

+	

+	/**

+	 * Wcet unit.

+	 *

+	 * @param wcetSpec the wcet spec

+	 * @param theUnit the the unit

+	 * @return the int

+	 */

+	private static int wcetUnit(String wcetSpec, String theUnit) {

+		int ret = -1;

+		if (wcetSpec == null)

+			return ret;

+

+		StringParser sp = new StringParser();

+		double value = sp.getValueNFP(wcetSpec);

+		String unit = sp.getUnitNFP(wcetSpec);

+

+		if (value == -1)

+			return ret;

+

+		int intValue = unitConversion(value, unit, theUnit);

+		return intValue;

+	}

+

+	

+	/**

+	 * Unit conversion float.

+	 *

+	 * @param value the value

+	 * @param fromUnit the from unit

+	 * @param toUnit the to unit

+	 * @return the float

+	 */

+	public static float unitConversionFloat(double value, String fromUnit, String toUnit) {

+		int toFactor = 1000000;

+

+		if (toUnit.equalsIgnoreCase("s")) {

+			toFactor = 1000000000;

+		} else if (toUnit.equalsIgnoreCase("ms")) {

+			toFactor = 1000000;

+		} else if (toUnit.equalsIgnoreCase("us")) {

+			toFactor = 1000;

+		} else if (toUnit.equalsIgnoreCase("ns")) {

+			toFactor = 1;

+		}

+

+		int fromFactor = 1000000;

+

+		if (fromUnit.equalsIgnoreCase("s")) {

+			fromFactor = 1000000000;

+		} else if (fromUnit.equalsIgnoreCase("ms")) {

+			fromFactor = 1000000;

+		} else if (fromUnit.equalsIgnoreCase("us")) {

+			fromFactor = 1000;

+		} else if (fromUnit.equalsIgnoreCase("ns")) {

+			fromFactor = 1;

+		}

+

+		float ratio = (float) fromFactor / toFactor;

+		float intValue = (float) (value * ratio);

+		return intValue;

+	}

+

+	

+	/**

+	 * Wcet unit float.

+	 *

+	 * @param wcetSpec the wcet spec

+	 * @param theUnit the the unit

+	 * @return the float

+	 */

+	private static float wcetUnitFloat(String wcetSpec, String theUnit) {

+		int ret = -1;

+		if (wcetSpec == null)

+			return ret;

+

+		StringParser sp = new StringParser();

+		double value = sp.getValueNFP(wcetSpec);

+		String unit = sp.getUnitNFP(wcetSpec);

+

+		if (value == -1)

+			return ret;

+

+		return unitConversionFloat(value, unit, theUnit);

+	}

+

+	

+	/**

+	 * Unit conversion.

+	 *

+	 * @param value the value

+	 * @param fromUnit the from unit

+	 * @param toUnit the to unit

+	 * @return the int

+	 */

+	public static int unitConversion(double value, String fromUnit, String toUnit) {

+		int toFactor = 1000000;

+

+		if (toUnit.equalsIgnoreCase("s")) {

+			toFactor = 1000000000;

+		} else if (toUnit.equalsIgnoreCase("ms")) {

+			toFactor = 1000000;

+		} else if (toUnit.equalsIgnoreCase("us")) {

+			toFactor = 1000;

+		} else if (toUnit.equalsIgnoreCase("ns")) {

+			toFactor = 1;

+		}

+

+		int fromFactor = 1000000;

+

+		if (fromUnit.equalsIgnoreCase("s")) {

+			fromFactor = 1000000000;

+		} else if (fromUnit.equalsIgnoreCase("ms")) {

+			fromFactor = 1000000;

+		} else if (fromUnit.equalsIgnoreCase("us")) {

+			fromFactor = 1000;

+		} else if (fromUnit.equalsIgnoreCase("ns")) {

+			fromFactor = 1;

+		}

+

+		double ratio = (double) fromFactor / toFactor;

+		int intValue = (int) Math.round(value * ratio);

+		return intValue;

+	}

+

+	

+	/**

+	 * Gets the WCE tunit float.

+	 *

+	 * @param chRtSpecification the ch rt specification

+	 * @param unitOfMeasure the unit of measure

+	 * @return the WCE tunit float

+	 * @throws ModelError the model error

+	 */

+	public static float getWCETunitFloat(CHRtSpecification chRtSpecification, String unitOfMeasure) throws ModelError {

+

+		StringParser sp = new StringParser();

+		String wcet = chRtSpecification.getLocalWCET();

+		float intValue = wcetUnitFloat(wcet, unitOfMeasure);

+

+		if (intValue != -1)

+			return intValue;

+

+		wcet = chRtSpecification.getWCET();

+

+		intValue = wcetUnit(wcet, unitOfMeasure);

+		if (intValue != -1)

+			return intValue;

+

+		throw new ModelError("WCET for %s is not set correctly", chRtSpecification.getContext().getName());

+	}

+

+	

+	/**

+	 * Gets the WCE tunit.

+	 *

+	 * @param chRtSpecification the ch rt specification

+	 * @param unitOfMeasure the unit of measure

+	 * @return the WCE tunit

+	 * @throws ModelError the model error

+	 */

+	public static int getWCETunit(CHRtSpecification chRtSpecification, String unitOfMeasure) throws ModelError {

+

+		StringParser sp = new StringParser();

+		String wcet = chRtSpecification.getLocalWCET();

+		int intValue = wcetUnit(wcet, unitOfMeasure);

+

+		if (intValue != -1)

+			return intValue;

+

+		wcet = chRtSpecification.getWCET();

+

+		intValue = wcetUnit(wcet, unitOfMeasure);

+		if (intValue != -1)

+			return intValue;

+

+		throw new ModelError("WCET for %s is not set correctly", chRtSpecification.getContext().getName());

+	}

+

+	/**

+	 * Gets the wcet.

+	 *

+	 * @param chRtSpecification the ch rt specification

+	 * @return the wcet

+	 * @throws ModelError the model error

+	 */

+	// TODO a similar method is implemented in the m2m plugin (Java4QVTutils.java)

+	public static double getWCET(CHRtSpecification chRtSpecification) throws ModelError {

+		StringParser sp = new StringParser();

+		double x = -1;

+		String wcet = chRtSpecification.getLocalWCET();

+		if (wcet != null) {

+			x = sp.getValueNFP(wcet);

+		}

+		if (x != -1)

+			return x;

+

+		wcet = chRtSpecification.getWCET();

+

+		if (wcet != null) {

+			x = sp.getValueNFP(wcet);

+		}

+		if (x != -1)

+			return x;

+

+		throw new ModelError("WCET for %s is not set correctly", chRtSpecification.getContext().getName());

+	}

+

+	/**

+	 * Check if Instance Specification in input is assigned to a Partition.

+	 *

+	 * @param i the i

+	 * @param assignments the assignments

+	 * @return true, if is assigned 2 partition

+	 */

+	public static boolean isAssigned2Partition(InstanceSpecification i, EList<Assign> assignments) {

+		for (Assign theAssignment : assignments) {

+			if (theAssignment != null) {

+				try {

+					if (theAssignment.getFrom().contains((Object) i) && (elementIsPartitionInstance(theAssignment.getTo().get(0)))) {

+						return true;

+					}

+				} catch (Exception e) {

+					continue;

+				}

+			}

+		}

+		return false;

+	}

+

+	/**

+	 * Check if this Partition is assigned to a CPU.

+	 *

+	 * @param i the i

+	 * @param assignments the assignments

+	 * @return true, if is assigned 2 processor

+	 */

+	public static boolean isAssigned2Processor(InstanceSpecification i, EList<Assign> assignments) {

+		for (Assign theAssignment : assignments) {

+			if (theAssignment != null) {

+				try {

+					if (theAssignment.getFrom().contains((Object) i) && elementIsProcessorInstance(theAssignment.getTo().get(0))) {

+						return true;

+					}

+				} catch (Exception e) {

+					continue;

+				}

+			}

+		}

+		return false;

+	}

+

+	/**

+	 * Check if this Partition is assigned to a CPU.

+	 *

+	 * @param i the i

+	 * @param pack the pack

+	 * @param assignments the assignments

+	 * @return true, if is assigned 2 core

+	 */

+	public static boolean isAssigned2Core(InstanceSpecification i, Package pack, EList<Assign> assignments) {

+		String packQN = pack.getQualifiedName();

+		String assignedTargetQN = "";

+		String assignedTargetElementName = "";

+

+		for (Assign theAssignment : assignments) {

+			if (theAssignment != null) {

+				try {

+					EList<Element> assignmentSource = theAssignment.getFrom();

+					Element assignmentTarget = theAssignment.getTo().get(0);

+					assignedTargetQN = ((NamedElement) assignmentTarget).getQualifiedName();

+					assignedTargetElementName = ((NamedElement) assignmentTarget).getLabel();

+					if (assignmentSource.contains((Object) i) && elementIsProcessorInstance(assignmentTarget)) {

+						if (!theAssignment.getImpliedConstraint().isEmpty() && theAssignment.getImpliedConstraint().get(0) != null) {

+							if ((packQN + "::" + assignedTargetElementName).equals(assignedTargetQN)) {

+								return true;

+							}

+						} else {

+							// Check if it is a single-core

+							InstanceSpecification instSpecProc = (InstanceSpecification) assignmentTarget;

+							if (processorInstanceIsSingleCore(instSpecProc)) {

+								if ((packQN + "::" + assignedTargetElementName).equals(assignedTargetQN)) {

+									return true;

+								}

+							}

+						}

+					}

+				} catch (Exception e) {

+					continue;

+				}

+			}

+		}

+		return false;

+	}

+

+	/**

+	 * Check if this Partition is assigned to a CPU.

+	 *

+	 * @param i the i

+	 * @param assignments the assignments

+	 * @return true, if is assigned 2 core

+	 */

+	public static boolean isAssigned2Core(InstanceSpecification i, EList<Assign> assignments) {

+		for (Assign theAssignment : assignments) {

+			if (theAssignment != null) {

+				try {

+					if (theAssignment.getFrom().contains((Object) i) && elementIsProcessorInstance(theAssignment.getTo().get(0))) {

+						if (!theAssignment.getImpliedConstraint().isEmpty() && theAssignment.getImpliedConstraint().get(0) != null) {

+							return true;

+						} else {

+							// Check if it is a single-core

+							Element elem = theAssignment.getTo().get(0);

+							InstanceSpecification instSpecProc = (InstanceSpecification) elem;

+							if (processorInstanceIsSingleCore(instSpecProc)) {

+								return true;

+							}

+						}

+					}

+				} catch (Exception e) {

+					continue;

+				}

+			}

+		}

+		return false;

+	}

+

+	// /**

+	// * Check if this Partition is assigned to a CPU

+	// * @param i

+	// * @param assignments

+	// * @return

+	// */

+	// public static boolean isAssigned2Core(InstanceSpecification i,

+	// EList<Assign> assignments) {

+	// for (Assign theAssignment : assignments) {

+	// if (theAssignment != null) {

+	// if (theAssignment.getFrom().contains((Object)i) &&

+	// elementIsProcessorInstance(theAssignment.getTo().get(0)) &&

+	// !theAssignment.getImpliedConstraint().isEmpty()&&

+	// theAssignment.getImpliedConstraint().get(0)!=null ) {

+	// return true;

+	// }

+	// }

+	// }

+	// return false;

+	// }

+

+	/**

+	 * Returns TRUE if the given Task is assigned to a Core in the Deployment

+	 * identified by the given package.

+	 *

+	 * @param task the task

+	 * @param pack the pack

+	 * @param assignments the assignments

+	 * @return true, if is task assigned 2 core

+	 */

+	public static boolean isTaskAssigned2Core(CHTask task, Package pack, EList<Assign> assignments) {

+		String taskName = task.getCHRtSpecification().getContext().getName();

+		String packQN = pack.getQualifiedName();

+		String assignedTargetQN = "";

+		String assignedTargetElementName = "";

+

+		for (Assign theAssignment : assignments) {

+			if (theAssignment != null) {

+				try {

+					Element assignmentSource = theAssignment.getFrom().get(0);

+					Element assignmentTarget = theAssignment.getTo().get(0);

+					assignedTargetQN = ((NamedElement) assignmentTarget).getQualifiedName();

+					assignedTargetElementName = ((NamedElement) assignmentTarget).getLabel();

+					if ((packQN + "::" + assignedTargetElementName).equals(assignedTargetQN) && QueryUtils.elementIsSlotInstance(assignmentSource) && theAssignment.getImpliedConstraint() != null

+							&& !theAssignment.getImpliedConstraint().isEmpty()) {

+						String theTaskValue = getTaskNameFromImpliedNfpConstraint(theAssignment);

+						if (theTaskValue != null && theTaskValue.length() > 0) {

+							if (theTaskValue.equals(taskName)) {

+								return true;

+							}

+						}

+					}

+				} catch (Exception e) {

+					continue;

+				}

+			}

+		}

+		return false;

+	}

+

+	/**

+	 * Returns true if the given task is assigned to a core, false otherwise.

+	 *

+	 * @param t the t

+	 * @param assignments the assignments

+	 * @return true if the given task is assigned to a core

+	 */

+	public static boolean isTaskAssigned2Core(CHTask t, EList<Assign> assignments) {

+		for (Assign theAssignment : assignments) {

+			if (theAssignment != null) {

+				Element assignmentSource = theAssignment.getFrom().get(0);

+				if (QueryUtils.elementIsSlotInstance(assignmentSource)) {

+					CHTask theTask = getTaskFromSlot(assignmentSource);

+					if ((theTask != null && theTask.equals(t)) && elementIsProcessorInstance(theAssignment.getTo().get(0))) {

+						return true;

+					}

+				}

+			}

+		}

+		return false;

+	}

+

+	/**

+	 * Given the Core (and related processor) get the list of partitions that are

+	 * assigned to it.

+	 *

+	 * @param core the core

+	 * @param assignments the assignments

+	 * @return the partitions assigned 2 core

+	 */

+	public static LinkedHashSet<Object> getPartitionsAssigned2Core(CHCore core, EList<Assign> assignments) {

+		LinkedHashSet<Object> result = new LinkedHashSet<Object>();

+		InstanceSpecification processorInstance = core.getProcessorInstance();

+		String theCoreName = core.getName();

+		String theCoreValue = null;

+		for (Assign theAssignment : assignments) {

+			if (theAssignment != null) {

+				try {

+					Element assignmentSource = theAssignment.getFrom().get(0);

+					// Only look at assignments where:

+					// ASSIGNMENT_SOURCE is a Partition

+					// ASSIGNMENT_TARGET is the Processor that owns the core

+					if (!QueryUtils.elementIsPartitionInstance(assignmentSource) || (!theAssignment.getTo().contains((Object) processorInstance))) {

+						continue;

+					}

+					// found an assignment for the processor that owns the core:

+					// let's look into it so see if it is related to the core we are

+					// analyzing

+					if (theAssignment.getImpliedConstraint() != null && !theAssignment.getImpliedConstraint().isEmpty()) {

+						theCoreValue = getCoreNameFromImpliedNfpConstraint(theAssignment);

+						if (theCoreValue.equals(theCoreName)) {

+							// if target of assignment is a partition

+							result.add(assignmentSource);

+						}

+					} else {

+						if (processorInstanceIsSingleCore(processorInstance)) {

+							// If no core is specified in the Implied Constraint and the

+							// Processor has only 1 Core

+							result.add(assignmentSource);

+						}

+					}

+				} catch (Exception e) {

+					continue;

+				}

+

+			}

+		}

+		return result;

+	}

+

+	

+	/**

+	 * Returns the name of the Core to which the given assignment is related.

+	 *

+	 * @param theAssignment the the assignment

+	 * @return the name of the Core to which theAssignment is related

+	 */

+	public static String getCoreNameFromImpliedNfpConstraint(Assign theAssignment) {

+		String coreName = null;

+		try {

+			NfpConstraint theImpliedNfpConstraint = theAssignment.getImpliedConstraint().get(0);

+			Constraint cnstr = theImpliedNfpConstraint.getBase_Constraint();

+			ValueSpecification valueSpec = cnstr.getSpecification();

+			LiteralString value = (LiteralString) valueSpec;

+			coreName = value.getValue();

+		} catch (Exception e) {

+			System.out.println("Error in getCoreNameFromImpliedNfpConstraint");

+		}

+		return coreName;

+	}

+

+	

+	/**

+	 * Gets the task name from implied nfp constraint.

+	 *

+	 * @param theAssignment the the assignment

+	 * @return the task name from implied nfp constraint

+	 */

+	private static String getTaskNameFromImpliedNfpConstraint(Assign theAssignment) {

+		String taskName = null;

+		try {

+			// the first one is the core, the second one is the task

+			NfpConstraint theImpliedNfpConstraint = theAssignment.getImpliedConstraint().get(1);

+			Constraint cnstr = theImpliedNfpConstraint.getBase_Constraint();

+			ValueSpecification valueSpec = cnstr.getSpecification();

+			LiteralString value = (LiteralString) valueSpec;

+			taskName = value.getValue();

+		} catch (Exception e) {

+			System.out.println("Error in getTaskNameFromImpliedNfpConstraint");

+		}

+		return taskName;

+	}

+

+	/**

+	 * Returns true if the given element is a partition instance, false otherwise.

+	 *

+	 * @param element the element

+	 * @return true if the element is a partition instance, false otherwise

+	 */

+	public static boolean elementIsPartitionInstance(Element element) {

+		if (!(element instanceof InstanceSpecification)) {

+			return false;

+		}

+		InstanceSpecification is = (InstanceSpecification) element;

+		if (is.getQualifiedName() != null && QueryUtils.isPartitionInstance(is)) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * Returns true if the given element is a component instance, false otherwise.

+	 *

+	 * @param element the element

+	 * @return true if the element is a component instance, false otherwise

+	 */

+	public static boolean elementIsComponentInstance(Element element) {

+		if (!(element instanceof InstanceSpecification)) {

+			return false;

+		}

+		InstanceSpecification is = (InstanceSpecification) element;

+		if (is.getQualifiedName() != null && QueryUtils.isComponentInstance(is)) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * Returns true if the given element is a processor instance, false otherwise.

+	 *

+	 * @param element the element

+	 * @return true if the element is a processor instance, false otherwise

+	 */

+	public static boolean elementIsProcessorInstance(Element element) {

+		if (!(element instanceof InstanceSpecification)) {

+			return false;

+		}

+		InstanceSpecification is = (InstanceSpecification) element;

+		if (is.getQualifiedName() != null && QueryUtils.isProcessorInstance(is)) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * Given the Core (and related processor) get the list of components that are

+	 * assigned to it.

+	 *

+	 * @param core the core

+	 * @param assignments the assignments

+	 * @return the components assigned 2 core

+	 */

+	public static LinkedHashSet<Object> getComponentsAssigned2Core(CHCore core, EList<Assign> assignments) {

+		LinkedHashSet<Object> result = new LinkedHashSet<Object>();

+		InstanceSpecification processorInstance = core.getProcessorInstance();

+		String theCoreName = core.getName();

+		String theCoreValue = null;

+

+		for (Assign theAssignment : assignments) {

+			if (theAssignment != null) {

+				try {

+					// Only look at assignments where:

+					// ASSIGNMENT_SOURCE is a Component

+					// ASSIGNMENT_TARGET is the Processor that owns the core

+					Element assignmentSource = theAssignment.getFrom().get(0);

+					if (!QueryUtils.elementIsComponentInstance(assignmentSource) || !theAssignment.getTo().contains((Object) processorInstance)) {

+						continue;

+					}

+

+					// found an assignment for the processor that owns the core:

+					// let's look into it so see if it is related to the core we are

+					// analyzing

+					if (theAssignment.getImpliedConstraint() != null && !theAssignment.getImpliedConstraint().isEmpty()) {

+						theCoreValue = getCoreNameFromImpliedNfpConstraint(theAssignment);

+						if (theCoreValue.equals(theCoreName)) {

+							result.add(assignmentSource);

+						}

+					} else {

+						if (processorInstanceIsSingleCore(processorInstance)) {

+							// If no core is specified in the Implied Constraint and the

+							// Processor has only 1 Core

+							result.add(assignmentSource);

+						}

+					}

+				} catch (Exception e) {

+					continue;

+				}

+

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * Given the Core (and related processor) get the list of tasks that are

+	 * assigned to it.

+	 *

+	 * @param core the core

+	 * @param pack the pack

+	 * @param assignments the assignments

+	 * @return the tasks assigned 2 core

+	 */

+	public static LinkedHashSet<Object> getTasksAssigned2Core(CHCore core, Package pack, EList<Assign> assignments) {

+		String packQN = pack.getQualifiedName();

+		LinkedHashSet<Object> result = new LinkedHashSet<Object>();

+		InstanceSpecification processorInstance = core.getProcessorInstance();

+		String theCoreName = core.getName();

+		String theCoreValue = null;

+		String theTaskValue = null;

+

+		for (Assign theAssignment : assignments) {

+			if (theAssignment != null) {

+				try {

+					if (theAssignment.getTo().contains((Object) processorInstance)) {

+						// found an assignment for the processor that owns the core:

+						// let's look into it so see if it is related to the core we are

+						// analyzing

+						Element assignmentSource = theAssignment.getFrom().get(0);

+						Element assignmentTarget = theAssignment.getTo().get(0);

+						String assignedTargetQN = ((NamedElement) assignmentTarget).getQualifiedName();

+						String assignedTargetElementName = ((NamedElement) assignmentTarget).getLabel();

+						EList<CHTask> chTaskList = new BasicEList<CHTask>();

+

+						if ((packQN + "::" + assignedTargetElementName).equals(assignedTargetQN) && theAssignment.getImpliedConstraint() != null && !theAssignment.getImpliedConstraint().isEmpty()) {

+							theCoreValue = getCoreNameFromImpliedNfpConstraint(theAssignment);

+							theTaskValue = getTaskNameFromImpliedNfpConstraint(theAssignment);

+

+							if (theCoreValue.equals(theCoreName)) {

+								if (QueryUtils.elementIsSlotInstance(assignmentSource)) {

+									chTaskList = getAllTasksFromSlot(assignmentSource);

+									for (CHTask theChTask : chTaskList) {

+										String theTaskName = theChTask.getCHRtSpecification().getContext().getName();

+										if (theChTask != null && theTaskName.equals(theTaskValue)) {

+											result.add(theChTask);

+										}

+									}

+								}

+							} else {

+								// If no core is specified in the Implied Constraint and the

+								// Processor has only 1 Core

+								if (processorInstanceIsSingleCore(processorInstance) && QueryUtils.elementIsSlotInstance(assignmentSource)) {

+									chTaskList = getAllTasksFromSlot(assignmentSource);

+									for (CHTask theChTask : chTaskList) {

+										String theTaskName = theChTask.getCHRtSpecification().getContext().getName();

+										if (theChTask != null && theTaskName.equals(theTaskValue)) {

+											result.add(theChTask);

+										}

+									}

+								}

+							}

+						}

+					}

+				} catch (Exception e) {

+					continue;

+				}

+			}

+		}

+		return result;

+	}

+

+	

+	/**

+	 * Returns the list of Component to Core assignments in the given view in the given model.

+	 *

+	 * @param umlModel the uml model

+	 * @param viewName the view name

+	 * @return the component 2 core assignments

+	 * @throws ModelError the model error

+	 */

+	public static EList<Assign> getComponent2CoreAssignments(Model umlModel, String viewName) throws ModelError {

+		// LB 20150708 we now look for assignments in the CHGA resource platform

+		// component

+		// Package cmpv = CHESSProfileManager.getViewByStereotype(umlModel,

+		// viewName);

+		// cmpv = QueryUtils.getResourcePlatformPackage(cmpv);

+

+		Component rpc = QueryUtils.getResourcePlatformComponent(umlModel, viewName);

+		EList<Element> all = rpc.allOwnedElements();

+		EList<Assign> assignments = new BasicEList<Assign>();

+		Stereotype stereo = null;

+		for (Element element : all) {

+			if ((element.getAppliedStereotype(MARTE_ASSIGN) != null)) {

+				stereo = element.getAppliedStereotype(MARTE_ASSIGN);

+				EObject eobj = element.getStereotypeApplication(stereo);

+				Assign a = (Assign) eobj;

+				Element assignmentSource = a.getFrom().get(0);

+				Element assignmentTarget = a.getTo().get(0);

+				// SOURCE must be a Component

+				// TARGET must be a Processor

+				if (elementIsProcessorInstance(assignmentTarget)) {

+					if (elementIsComponentInstance(assignmentSource)) {

+						InstanceSpecification componentInst = (InstanceSpecification) assignmentSource;

+						if (isComponentInstance(componentInst)) {

+							assignments.add(a);

+						}

+					}

+				}

+			}

+		}

+		return assignments;

+	}

+

+	

+	/**

+	 * Returns the list of Component to Partition assignments in the given view in the given model.

+	 *

+	 * @param umlModel the uml model

+	 * @param viewName the view name

+	 * @return the component 2 partition assignments

+	 * @throws ModelError the model error

+	 */

+	public static EList<Assign> getComponent2PartitionAssignments(Model umlModel, String viewName) throws ModelError {

+		// LB 20150708 we now look for assignments in the CHGA resource platform

+		// component

+		// Package cmpv = CHESSProfileManager.getViewByStereotype(umlModel,

+		// viewName);

+		// cmpv = QueryUtils.getResourcePlatformPackage(cmpv);

+

+		Component rpc = QueryUtils.getResourcePlatformComponent(umlModel, viewName);

+		EList<Element> all = rpc.allOwnedElements();

+		EList<Assign> assignments = new BasicEList<Assign>();

+		Stereotype stereo = null;

+		for (Element element : all) {

+			if ((element.getAppliedStereotype(MARTE_ASSIGN) != null)) {

+				stereo = element.getAppliedStereotype(MARTE_ASSIGN);

+				EObject eobj = element.getStereotypeApplication(stereo);

+				Assign a = (Assign) eobj;

+				Element assignmentSource = a.getFrom().get(0);

+				Element assignmentTarget = a.getTo().get(0);

+				// SOURCE must be a Component

+				// TARGET must be a Partition

+				if (elementIsPartitionInstance(assignmentTarget)) {

+					if (elementIsComponentInstance(assignmentSource)) {

+						InstanceSpecification componentInst = (InstanceSpecification) assignmentSource;

+						if (isComponentInstance(componentInst)) {

+							assignments.add(a);

+						}

+					}

+				}

+			}

+		}

+		return assignments;

+	}

+

+	

+	/**

+	 * Returns the list of Partition to Core assignments in the given view in the given model.

+	 *

+	 * @param umlModel the uml model

+	 * @param viewName the view name

+	 * @return the partition 2 core assignments

+	 * @throws ModelError the model error

+	 */

+	public static EList<Assign> getPartition2CoreAssignments(Model umlModel, String viewName) throws ModelError {

+		// LB 20150708 we now look for assignments in the CHGA resource platform

+		// component

+		// Package cmpv = CHESSProfileManager.getViewByStereotype(umlModel,

+		// viewName);

+		// cmpv = QueryUtils.getResourcePlatformPackage(cmpv);

+

+		Component rpc = QueryUtils.getResourcePlatformComponent(umlModel, viewName);

+		EList<Element> all = rpc.allOwnedElements();

+		EList<Assign> assignments = new BasicEList<Assign>();

+		Stereotype stereo = null;

+		for (Element element : all) {

+			if ((element.getAppliedStereotype(MARTE_ASSIGN) != null)) {

+				stereo = element.getAppliedStereotype(MARTE_ASSIGN);

+				EObject eobj = element.getStereotypeApplication(stereo);

+				Assign a = (Assign) eobj;

+				Element assignmentSource = a.getFrom().get(0);

+				Element assignmentTarget = a.getTo().get(0);

+				// SOURCE must be a Partition

+				// TARGET must be a Processor

+				if (elementIsPartitionInstance(assignmentSource) && elementIsProcessorInstance(assignmentTarget)) {

+					assignments.add(a);

+				}

+			}

+		}

+		return assignments;

+	}

+

+	/**

+	 * Returns the list of Task to Core assignments in the given view in the given model.

+	 *

+	 * @param umlModel the uml model

+	 * @param viewName the view name

+	 * @return the task 2 core assignments

+	 * @throws ModelError the model error

+	 */

+	public static EList<Assign> getTask2CoreAssignments(Model umlModel, String viewName) throws ModelError {

+		// LB 20150708 we now look for assignments in the CHGA resource platform

+		// component

+		// Package cmpv = CHESSProfileManager.getViewByStereotype(umlModel,

+		// viewName);

+		// cmpv = QueryUtils.getResourcePlatformPackage(cmpv);

+

+		Component rpc = QueryUtils.getResourcePlatformComponent(umlModel, viewName);

+		EList<Element> all = rpc.allOwnedElements();

+		EList<Assign> assignments = new BasicEList<Assign>();

+		Stereotype stereo = null;

+		for (Element element : all) {

+			if ((element.getAppliedStereotype(MARTE_ASSIGN) != null)) {

+				stereo = element.getAppliedStereotype(MARTE_ASSIGN);

+				EObject eobj = element.getStereotypeApplication(stereo);

+				Assign a = (Assign) eobj;

+				Element assignmentSource = a.getFrom().get(0);

+				Element assignmentTarget = a.getTo().get(0);

+				// SOURCE must be a Task

+				// TARGET must be a Processor

+				if (elementIsSlotInstance(assignmentSource) && elementIsProcessorInstance(assignmentTarget)) {

+					assignments.add(a);

+				}

+			}

+		}

+		return assignments;

+	}

+

+	/**

+	 * Returns true is the input Instance Processor has only 1 CORE.

+	 *

+	 * @param processorInstance the processor instance

+	 * @return true, if successful

+	 */

+	public static boolean processorInstanceIsSingleCore(InstanceSpecification processorInstance) {

+		Classifier processorClass = processorInstance.getClassifiers().get(0);

+		CH_HwProcessor processorType = UMLUtils.getStereotypeApplication(processorClass, CH_HwProcessor.class);

+		String coreNumber = null;

+		coreNumber = processorType.getNbCores();

+		int icoreNumber = 1;

+		try {

+			icoreNumber = Integer.parseInt(coreNumber);

+		} catch (Exception e) {

+			icoreNumber = 1;

+		}

+		if (icoreNumber == 1) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * Returns the Package (in the Deployment View) that owns the input system.

+	 *

+	 * @param umlModel the uml model

+	 * @param theSystem the the system

+	 * @return the owner CH ga resource platform package

+	 * @throws ModelError the model error

+	 */

+	public static Package getOwnerCHGaResourcePlatformPackage(Model umlModel, InstanceSpecification theSystem) throws ModelError {

+		EList<Package> packList = QueryUtils.getResourcePlatformPackages(umlModel, Constants.DEPLOYMENT_VIEW_NAME);

+		for (Package pack : packList) {

+			EList<Element> packElems = pack.allOwnedElements();

+			for (Element elem : packElems) {

+				if (elem instanceof InstanceSpecification) {

+					if (((InstanceSpecification) elem).equals(theSystem)) {

+						return pack;

+					}

+				}

+			}

+		}

+		return null;

+	}

+

+}

diff --git a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/utils/VSLUtils.java b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/utils/VSLUtils.java
index 01318a9..3202a5b 100644
--- a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/utils/VSLUtils.java
+++ b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/utils/VSLUtils.java
@@ -1,100 +1,107 @@
-/*------------------------------------------------------------------------------
-  -
-  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 
-  - 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:
-  -
-  - Alessandro Zovi azovi@math.unipd.it
-  - Stefano Puri stefano.puri@intecs.it
-  - Laura Baracchi laura.baracchi@intecs.it
-  - Nicholas Pacini nicholas.pacini@intecs.it  
-  -
-  - Initial API and implementation and/or initial documentation
-  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.utils;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * The Class VSLUtils.
- */
-public class VSLUtils {
-
-
-	
-	
-	/**
-	 * Gets the bounds.
-	 *
-	 * @param value the value
-	 * @return the bounds
-	 */
-	public static int[] getBounds(String value) {
-		String regex = "\\s*\\[\\s*(\\d+)\\s*\\.*\\s*(\\d+)\\]\\s*";
-		Pattern pattern = Pattern.compile(regex);
-		Matcher matcher = pattern.matcher(value);
-		int[] b = new int[2];
-
-		if (matcher.find() && matcher.groupCount() == 2) {
-			String begin_ = matcher.group(1);
-			String end_ = matcher.group(2);
-			b[0] = Integer.parseInt(begin_);
-			b[1] = Integer.parseInt(end_);
-			return b;
-		}
-		
-		regex = "\\s*\\[\\s*(\\d+)\\s*\\]\\s*";
-		pattern = Pattern.compile(regex);
-		matcher = pattern.matcher(value);
-		if (matcher.find() && matcher.groupCount() == 1) {
-			String begin_ = matcher.group(1);
-			b[0] = Integer.parseInt(begin_);
-			b[1] = b[0];
-			return b;
-		}
-		
-		regex = "\\s*(\\d+)\\s*";
-		pattern = Pattern.compile(regex);
-		matcher = pattern.matcher(value);
-		if (matcher.find() && matcher.groupCount() == 1) {
-			String begin_ = matcher.group(1);
-			b[0] = Integer.parseInt(begin_);
-			b[1] = b[0];
-			return b;
-		}
-		
-		return null;
-	}
-	
-	/**
-	 * Checks if is in bounds.
-	 *
-	 * @param id the id
-	 * @param bounds the bounds
-	 * @return the boolean
-	 */
-	public static Boolean isInBounds(int id, java.util.List<int[]> bounds) {
-		for (int[] b : bounds) {
-			if (isInBounds(id, b))
-				return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Checks if is in bounds.
-	 *
-	 * @param id the id
-	 * @param bounds the bounds
-	 * @return the boolean
-	 */
-	private static Boolean isInBounds(int id, int[] bounds) {
-		return id >= bounds[0] && id <= bounds[1];
-	}
-	
-	
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+/*------------------------------------------------------------------------------

+  -

+  - Copyright (c) 2015-2016 University of Padova, ITALY -  Intecs SpA 

+  - All rights reserved. This program and the accompanying materials

+  - are made available under the terms of the Eclipse Public License v2.0

+  - which accompanies this distribution, and is available at

+  - http://www.eclipse.org/legal/epl-v20.html

+  -

+  - Contributors:

+  -

+  - Alessandro Zovi azovi@math.unipd.it

+  - Stefano Puri stefano.puri@intecs.it

+  - Laura Baracchi laura.baracchi@intecs.it

+  - Nicholas Pacini nicholas.pacini@intecs.it  

+  -

+  - Initial API and implementation and/or initial documentation

+  ------------------------------------------------------------------------------*/package org.polarsys.chess.multicore.utils;

+

+import java.util.regex.Matcher;

+import java.util.regex.Pattern;

+

+/**

+ * The Class VSLUtils.

+ */

+public class VSLUtils {

+

+

+	

+	

+	/**

+	 * Gets the bounds.

+	 *

+	 * @param value the value

+	 * @return the bounds

+	 */

+	public static int[] getBounds(String value) {

+		String regex = "\\s*\\[\\s*(\\d+)\\s*\\.*\\s*(\\d+)\\]\\s*";

+		Pattern pattern = Pattern.compile(regex);

+		Matcher matcher = pattern.matcher(value);

+		int[] b = new int[2];

+

+		if (matcher.find() && matcher.groupCount() == 2) {

+			String begin_ = matcher.group(1);

+			String end_ = matcher.group(2);

+			b[0] = Integer.parseInt(begin_);

+			b[1] = Integer.parseInt(end_);

+			return b;

+		}

+		

+		regex = "\\s*\\[\\s*(\\d+)\\s*\\]\\s*";

+		pattern = Pattern.compile(regex);

+		matcher = pattern.matcher(value);

+		if (matcher.find() && matcher.groupCount() == 1) {

+			String begin_ = matcher.group(1);

+			b[0] = Integer.parseInt(begin_);

+			b[1] = b[0];

+			return b;

+		}

+		

+		regex = "\\s*(\\d+)\\s*";

+		pattern = Pattern.compile(regex);

+		matcher = pattern.matcher(value);

+		if (matcher.find() && matcher.groupCount() == 1) {

+			String begin_ = matcher.group(1);

+			b[0] = Integer.parseInt(begin_);

+			b[1] = b[0];

+			return b;

+		}

+		

+		return null;

+	}

+	

+	/**

+	 * Checks if is in bounds.

+	 *

+	 * @param id the id

+	 * @param bounds the bounds

+	 * @return the boolean

+	 */

+	public static Boolean isInBounds(int id, java.util.List<int[]> bounds) {

+		for (int[] b : bounds) {

+			if (isInBounds(id, b))

+				return true;

+		}

+		return false;

+	}

+	

+	/**

+	 * Checks if is in bounds.

+	 *

+	 * @param id the id

+	 * @param bounds the bounds

+	 * @return the boolean

+	 */

+	private static Boolean isInBounds(int id, int[] bounds) {

+		return id >= bounds[0] && id <= bounds[1];

+	}

+	

+	

+}

diff --git a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/utils/package.html b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/utils/package.html
index 7d7d546..ffa6b93 100644
--- a/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/utils/package.html
+++ b/plugins/org.polarsys.chess.multicore/src/org/polarsys/chess/multicore/utils/package.html
@@ -1,7 +1,14 @@
+#-------------------------------------------------------------------------------

+# Copyright (C) 2020 

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v2.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v20.html

+#-------------------------------------------------------------------------------

 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

 <html>

 <head></head>

 <body>

   Provides...

 </body>

-</html>
\ No newline at end of file
+</html>

diff --git a/plugins/org.polarsys.chess.paramArchConfigurator/about.html b/plugins/org.polarsys.chess.paramArchConfigurator/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/plugins/org.polarsys.chess.paramArchConfigurator/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/commands/InstantiateArchitectureViaWizard.java b/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/commands/InstantiateArchitectureViaWizard.java
index 037a8ca..a17bcf1 100644
--- a/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/commands/InstantiateArchitectureViaWizard.java
+++ b/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/commands/InstantiateArchitectureViaWizard.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2018 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *  

  * Contributors:

  *   Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/commands/InstantiateParamArchAsOssFileCommand.java b/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/commands/InstantiateParamArchAsOssFileCommand.java
index 2226ad7..ee488d1 100644
--- a/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/commands/InstantiateParamArchAsOssFileCommand.java
+++ b/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/commands/InstantiateParamArchAsOssFileCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2018 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *  

  * Contributors:

  *   Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/ui/dialog/ConfigParameter.java b/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/ui/dialog/ConfigParameter.java
index 32eeca7..40ec8c2 100644
--- a/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/ui/dialog/ConfigParameter.java
+++ b/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/ui/dialog/ConfigParameter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2018 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *  

  * Contributors:

  *   Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/ui/wizard/InstantiateArchWizard.java b/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/ui/wizard/InstantiateArchWizard.java
index 4ddb10e..136f99f 100644
--- a/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/ui/wizard/InstantiateArchWizard.java
+++ b/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/ui/wizard/InstantiateArchWizard.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2018 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *  

  * Contributors:

  *   Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/ui/wizard/PackageViewFilter.java b/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/ui/wizard/PackageViewFilter.java
index 50d17ba..684adfa 100644
--- a/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/ui/wizard/PackageViewFilter.java
+++ b/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/ui/wizard/PackageViewFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2018 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *  

  * Contributors:

  *   Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/ui/wizard/TreeSelector.java b/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/ui/wizard/TreeSelector.java
index 56af7df..87f5a9a 100644
--- a/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/ui/wizard/TreeSelector.java
+++ b/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/ui/wizard/TreeSelector.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2018 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *  

  * Contributors:

  *   Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/ui/wizard/page/AssignValuesPage.java b/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/ui/wizard/page/AssignValuesPage.java
index 6472325..4995d5c 100644
--- a/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/ui/wizard/page/AssignValuesPage.java
+++ b/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/ui/wizard/page/AssignValuesPage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2018 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *  

  * Contributors:

  *   Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/ui/wizard/page/BasicWizardPage.java b/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/ui/wizard/page/BasicWizardPage.java
index 7dff03f..4db3a12 100644
--- a/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/ui/wizard/page/BasicWizardPage.java
+++ b/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/ui/wizard/page/BasicWizardPage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2018 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *  

  * Contributors:

  *   Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/ui/wizard/page/LastPage.java b/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/ui/wizard/page/LastPage.java
index 547cf46..c7ab37b 100644
--- a/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/ui/wizard/page/LastPage.java
+++ b/plugins/org.polarsys.chess.paramArchConfigurator/src/org/polarsys/chess/paramArchConfigurator/ui/wizard/page/LastPage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2018 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *  

  * Contributors:

  *   Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.patterns.library/about.html b/plugins/org.polarsys.chess.patterns.library/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/plugins/org.polarsys.chess.patterns.library/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.patterns.profile/about.html b/plugins/org.polarsys.chess.patterns.profile/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/plugins/org.polarsys.chess.patterns.profile/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.patterns/about.html b/plugins/org.polarsys.chess.patterns/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/plugins/org.polarsys.chess.patterns/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.properties.propertyEditor/about.html b/plugins/org.polarsys.chess.properties.propertyEditor/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/plugins/org.polarsys.chess.properties.propertyEditor/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.properties.propertyEditor/src/org/polarsys/chess/properties/propertyEditor/CustomPropertyEditorTab.java b/plugins/org.polarsys.chess.properties.propertyEditor/src/org/polarsys/chess/properties/propertyEditor/CustomPropertyEditorTab.java
index 9a5efa4..848a7f7 100644
--- a/plugins/org.polarsys.chess.properties.propertyEditor/src/org/polarsys/chess/properties/propertyEditor/CustomPropertyEditorTab.java
+++ b/plugins/org.polarsys.chess.properties.propertyEditor/src/org/polarsys/chess/properties/propertyEditor/CustomPropertyEditorTab.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.properties.propertyEditor/src/org/polarsys/chess/properties/propertyEditor/PropertyEditorFilter.java b/plugins/org.polarsys.chess.properties.propertyEditor/src/org/polarsys/chess/properties/propertyEditor/PropertyEditorFilter.java
index b161c82..e7c9631 100644
--- a/plugins/org.polarsys.chess.properties.propertyEditor/src/org/polarsys/chess/properties/propertyEditor/PropertyEditorFilter.java
+++ b/plugins/org.polarsys.chess.properties.propertyEditor/src/org/polarsys/chess/properties/propertyEditor/PropertyEditorFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.service/about.html b/plugins/org.polarsys.chess.service/about.html
index dd3c089..164f781 100644
--- a/plugins/org.polarsys.chess.service/about.html
+++ b/plugins/org.polarsys.chess.service/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>November 14, 2008</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/exceptions/NoComponentException.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/exceptions/NoComponentException.java
index 2ad02e0..0b86cc2 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/exceptions/NoComponentException.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/exceptions/NoComponentException.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/exceptions/NoDiagramStatusException.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/exceptions/NoDiagramStatusException.java
index 9745ad7..6fb2996 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/exceptions/NoDiagramStatusException.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/exceptions/NoDiagramStatusException.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2018 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *  

  * Contributors:

  *   Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/model/ChessSystemModel.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/model/ChessSystemModel.java
index 695cee8..cb8f93b 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/model/ChessSystemModel.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/model/ChessSystemModel.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/model/UMLStateMachineModel.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/model/UMLStateMachineModel.java
index def42c4..c417a1c 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/model/UMLStateMachineModel.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/model/UMLStateMachineModel.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *  

  * Contributors:

  *   Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/utils/AnalysisResultUtil.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/utils/AnalysisResultUtil.java
index 8108579..618c10f 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/utils/AnalysisResultUtil.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/utils/AnalysisResultUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/utils/FileNamesUtil.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/utils/FileNamesUtil.java
index 8b6e0fc..6a88024 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/utils/FileNamesUtil.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/utils/FileNamesUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/CHESSEditorUtils.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/CHESSEditorUtils.java
index 7c73bdc..75d7427 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/CHESSEditorUtils.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/CHESSEditorUtils.java
@@ -10,7 +10,7 @@
 -- 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                         --

+-- http://www.eclipse.org/legal/epl-v20.html                         --

 -----------------------------------------------------------------------

  */

 

diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/DialogUtils.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/DialogUtils.java
index 7695b14..d407a64 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/DialogUtils.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/DialogUtils.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/ReportProblemsUtil.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/ReportProblemsUtil.java
index 8f1db20..99b105c 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/ReportProblemsUtil.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/ReportProblemsUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2020 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/SelectionUtil.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/SelectionUtil.java
index a894ec3..09145be 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/SelectionUtil.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/SelectionUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  * 

  * Contributors:

  *     Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/Activator.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/Activator.java
index 57fa845..ef3f7fa 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/Activator.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/Activator.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/MatchingStrategy.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/MatchingStrategy.java
index b097c97..be9f591 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/MatchingStrategy.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/MatchingStrategy.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/commands/CurrentViewStatusCommand.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/commands/CurrentViewStatusCommand.java
index 24d0d5c..76a4300 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/commands/CurrentViewStatusCommand.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/commands/CurrentViewStatusCommand.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/commands/SupersuserToggleCommand.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/commands/SupersuserToggleCommand.java
index 8fe6d27..aa9e9e7 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/commands/SupersuserToggleCommand.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/commands/SupersuserToggleCommand.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/commands/switchers/SwitchSourceProvider.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/commands/switchers/SwitchSourceProvider.java
index ed1a6c0..1915519 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/commands/switchers/SwitchSourceProvider.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/commands/switchers/SwitchSourceProvider.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/commands/switchers/SwitchToDependabilityCommand.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/commands/switchers/SwitchToDependabilityCommand.java
index 652fdff..bdaf817 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/commands/switchers/SwitchToDependabilityCommand.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/commands/switchers/SwitchToDependabilityCommand.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/commands/switchers/SwitchToExtraFunctionalCommand.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/commands/switchers/SwitchToExtraFunctionalCommand.java
index ac2646b..9597798 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/commands/switchers/SwitchToExtraFunctionalCommand.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/commands/switchers/SwitchToExtraFunctionalCommand.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/commands/switchers/SwitchToRailwayCommand.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/commands/switchers/SwitchToRailwayCommand.java
index c906dd7..00725af 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/commands/switchers/SwitchToRailwayCommand.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/commands/switchers/SwitchToRailwayCommand.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/commands/switchers/SwitchToView.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/commands/switchers/SwitchToView.java
index 4266966..c70e594 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/commands/switchers/SwitchToView.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/commands/switchers/SwitchToView.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/palette/PaletteManager.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/palette/PaletteManager.java
index bf38cfe..fcc1ff2 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/palette/PaletteManager.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/palette/PaletteManager.java
@@ -10,7 +10,7 @@
 -- 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                         --

+-- http://www.eclipse.org/legal/epl-v20.html                         --

 -----------------------------------------------------------------------

 */

 

diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/service/CHESSService.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/service/CHESSService.java
index 2e8f09c..cfb38b3 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/service/CHESSService.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/service/CHESSService.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/service/CHESSServiceFactory.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/service/CHESSServiceFactory.java
index 76e3445..4b48575 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/service/CHESSServiceFactory.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/service/CHESSServiceFactory.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/service/SelectionListener.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/service/SelectionListener.java
index b42af99..d1355bb 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/service/SelectionListener.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/service/SelectionListener.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/utils/CHESSInternalEditorUtils.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/utils/CHESSInternalEditorUtils.java
index 7feeedd..70e2437 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/utils/CHESSInternalEditorUtils.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/utils/CHESSInternalEditorUtils.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 
diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/visibility/HidePortCommand.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/visibility/HidePortCommand.java
index da76c9a..4b82a19 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/visibility/HidePortCommand.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/internal/visibility/HidePortCommand.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.smvExporter/about.html b/plugins/org.polarsys.chess.smvExporter/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/plugins/org.polarsys.chess.smvExporter/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.smvExporter/src/org/polarsys/chess/smvExporter/ui/commands/ExportModelToMonolithicSMVCommand.java b/plugins/org.polarsys.chess.smvExporter/src/org/polarsys/chess/smvExporter/ui/commands/ExportModelToMonolithicSMVCommand.java
index e1cbc66..c973b38 100644
--- a/plugins/org.polarsys.chess.smvExporter/src/org/polarsys/chess/smvExporter/ui/commands/ExportModelToMonolithicSMVCommand.java
+++ b/plugins/org.polarsys.chess.smvExporter/src/org/polarsys/chess/smvExporter/ui/commands/ExportModelToMonolithicSMVCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2018 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  * 

  * Contributors:

  *     Luca Cristoforetti - initial API and implementation

diff --git a/plugins/org.polarsys.chess.smvExporter/src/org/polarsys/chess/smvExporter/ui/commands/ExportNominalSMsToSmvFilesCommand.java b/plugins/org.polarsys.chess.smvExporter/src/org/polarsys/chess/smvExporter/ui/commands/ExportNominalSMsToSmvFilesCommand.java
index 26a0e5a..3ad6349 100644
--- a/plugins/org.polarsys.chess.smvExporter/src/org/polarsys/chess/smvExporter/ui/commands/ExportNominalSMsToSmvFilesCommand.java
+++ b/plugins/org.polarsys.chess.smvExporter/src/org/polarsys/chess/smvExporter/ui/commands/ExportNominalSMsToSmvFilesCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *  

  * Contributors:

  *   Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.smvExporter/src/org/polarsys/chess/smvExporter/ui/commands/ExportSelectedNominalSMsToSmvFilesCommand.java b/plugins/org.polarsys.chess.smvExporter/src/org/polarsys/chess/smvExporter/ui/commands/ExportSelectedNominalSMsToSmvFilesCommand.java
index 1598fea..26c119e 100644
--- a/plugins/org.polarsys.chess.smvExporter/src/org/polarsys/chess/smvExporter/ui/commands/ExportSelectedNominalSMsToSmvFilesCommand.java
+++ b/plugins/org.polarsys.chess.smvExporter/src/org/polarsys/chess/smvExporter/ui/commands/ExportSelectedNominalSMsToSmvFilesCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************

  * Copyright (C) 2017 Fondazione Bruno Kessler.

  * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

+ * are made available under the terms of the Eclipse Public License v2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * http://www.eclipse.org/legal/epl-v20.html

  *  

  * Contributors:

  *   Alberto Debiasi - initial API and implementation

diff --git a/plugins/org.polarsys.chess.smvExporter/src/org/polarsys/chess/smvExporter/ui/services/CHESSSmvExporterService.java b/plugins/org.polarsys.chess.smvExporter/src/org/polarsys/chess/smvExporter/ui/services/CHESSSmvExporterService.java
index 2298369..a026a10 100644
--- a/plugins/org.polarsys.chess.smvExporter/src/org/polarsys/chess/smvExporter/ui/services/CHESSSmvExporterService.java
+++ b/plugins/org.polarsys.chess.smvExporter/src/org/polarsys/chess/smvExporter/ui/services/CHESSSmvExporterService.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.smvExporter/src/org/polarsys/chess/smvExporter/ui/utils/SMVGenerationDialogUtil.java b/plugins/org.polarsys.chess.smvExporter/src/org/polarsys/chess/smvExporter/ui/utils/SMVGenerationDialogUtil.java
index 8db62d6..4fa8256 100644
--- a/plugins/org.polarsys.chess.smvExporter/src/org/polarsys/chess/smvExporter/ui/utils/SMVGenerationDialogUtil.java
+++ b/plugins/org.polarsys.chess.smvExporter/src/org/polarsys/chess/smvExporter/ui/utils/SMVGenerationDialogUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.tabbedproperties/about.html b/plugins/org.polarsys.chess.tabbedproperties/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/plugins/org.polarsys.chess.tabbedproperties/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.test.runtime/about.html b/plugins/org.polarsys.chess.test.runtime/about.html
index dd3c089..164f781 100644
--- a/plugins/org.polarsys.chess.test.runtime/about.html
+++ b/plugins/org.polarsys.chess.test.runtime/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>November 14, 2008</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.test.runtime/build.properties b/plugins/org.polarsys.chess.test.runtime/build.properties
index d7d16f6..bf98082 100644
--- a/plugins/org.polarsys.chess.test.runtime/build.properties
+++ b/plugins/org.polarsys.chess.test.runtime/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2015 Intecs.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     
diff --git a/plugins/org.polarsys.chess.test.runtime/plugin.properties b/plugins/org.polarsys.chess.test.runtime/plugin.properties
index f6f46a0..8c56f95 100644
--- a/plugins/org.polarsys.chess.test.runtime/plugin.properties
+++ b/plugins/org.polarsys.chess.test.runtime/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2015 Intecs.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     
diff --git a/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/Activator.java b/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/Activator.java
index 051f6b1..913d951 100644
--- a/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/Activator.java
+++ b/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/Activator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Intecs.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Nicholas Pacini
diff --git a/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/handlers/TestsHandler.java b/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/handlers/TestsHandler.java
index 22e56e8..95d7b7a 100644
--- a/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/handlers/TestsHandler.java
+++ b/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/handlers/TestsHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Intecs.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Nicholas Pacini
diff --git a/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/tests/AllTests.java b/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/tests/AllTests.java
index 46ccfce..b81e42c 100644
--- a/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/tests/AllTests.java
+++ b/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/tests/AllTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Intecs.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Nicholas Pacini
diff --git a/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/tests/TestApplyCHESSStereotype.java b/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/tests/TestApplyCHESSStereotype.java
index 5dc8a76..33fc1a6 100644
--- a/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/tests/TestApplyCHESSStereotype.java
+++ b/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/tests/TestApplyCHESSStereotype.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Intecs.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Nicholas Pacini
diff --git a/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/tests/TestApplyRecursively.java b/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/tests/TestApplyRecursively.java
index cd1da95..f98236d 100644
--- a/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/tests/TestApplyRecursively.java
+++ b/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/tests/TestApplyRecursively.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Intecs.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Nicholas Pacini
diff --git a/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/tests/TestCreateViews.java b/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/tests/TestCreateViews.java
index 768e104..a080c30 100644
--- a/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/tests/TestCreateViews.java
+++ b/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/tests/TestCreateViews.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Intecs.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Nicholas Pacini
diff --git a/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/util/TestUtil.java b/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/util/TestUtil.java
index 39afafe..2ab9fd2 100644
--- a/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/util/TestUtil.java
+++ b/plugins/org.polarsys.chess.test.runtime/src/org/polarsys/chess/test/runtime/util/TestUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Intecs.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Nicholas Pacini
diff --git a/plugins/org.polarsys.chess.test.runtime/target/work/plugins/org.eclipse.jdt.debug_3.10.1.v20160811-0441/about.html b/plugins/org.polarsys.chess.test.runtime/target/work/plugins/org.eclipse.jdt.debug_3.10.1.v20160811-0441/about.html
new file mode 100644
index 0000000..4602330
--- /dev/null
+++ b/plugins/org.polarsys.chess.test.runtime/target/work/plugins/org.eclipse.jdt.debug_3.10.1.v20160811-0441/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 2, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.test.runtime/target/work/plugins/org.eclipse.pde.build_3.9.200.v20160204-0642/about.html b/plugins/org.polarsys.chess.test.runtime/target/work/plugins/org.eclipse.pde.build_3.9.200.v20160204-0642/about.html
new file mode 100644
index 0000000..5ac3da7
--- /dev/null
+++ b/plugins/org.polarsys.chess.test.runtime/target/work/plugins/org.eclipse.pde.build_3.9.200.v20160204-0642/about.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>February 08, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+<h3>Third Party Content</h3>
+
+<p>The Content includes items that have been sourced from third parties as set out below. If you 
+did not receive this Content directly from the Eclipse Foundation, the following is provided 
+for informational purposes only, and you should look to the Redistributor&rsquo;s license for 
+terms and conditions of use.</p>
+
+<h4>OSGi Materials</h4>
+
+<p>The following file:</p>
+
+<ul>
+	<li>org/osgi/framework/Version</li>
+</ul>
+
+<p>shall be defined as a subset of the &quot;OSGi Materials.&quot;  The OSGi Materials are:</p>
+
+<blockquote>
+Copyright (c) 2000, 2006
+<br /><br />
+OSGi Alliance
+Bishop Ranch 6<br/>
+2400 Camino Ramon, Suite 375<br/>
+San Ramon, CA 94583 USA
+<br /><br />
+All Rights Reserved.
+</blockquote>
+
+<p>The OSGi Materials are provided to you under the terms and conditions of the Apache License, Version 2.0.  A copy of the license is contained
+in the file <a href="about_files/LICENSE-2.0.txt" target="_blank">LICENSE-2.0.txt</a> and is also available at <a href="http://www.apache.org/licenses/LICENSE-2.0.html" target="_blank">http://www.apache.org/licenses/LICENSE-2.0.html</a>.</p>
+
+<p>Implementation of certain elements of the OSGi Materials may be subject to third party intellectual property rights, including without limitation, patent rights (such a third party may
+or may not be a member of the OSGi Alliance).  The OSGi Alliance and its members are not responsible and shall not be held responsible in any manner for identifying or failing to identify any or all such third party
+intellectual property rights.</p>
+
+<small>OSGi&trade; is a trademark, registered trademark, or service mark of The OSGi Alliance in the US and other countries. Java is a trademark,
+registered trademark, or service mark of Sun Microsystems, Inc. in the US and other countries. All other trademarks, registered trademarks, or
+service marks used in the Content are the property of their respective owners and are hereby recognized.</small>
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.tradeoffAnalysis/about.html b/plugins/org.polarsys.chess.tradeoffAnalysis/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/plugins/org.polarsys.chess.tradeoffAnalysis/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.tradeoffAnalysis/src/org/polarsys/chess/tradeoffAnalysis/commands/TradeoffCommand.java b/plugins/org.polarsys.chess.tradeoffAnalysis/src/org/polarsys/chess/tradeoffAnalysis/commands/TradeoffCommand.java
index 0b92a23..3ff9770 100644
--- a/plugins/org.polarsys.chess.tradeoffAnalysis/src/org/polarsys/chess/tradeoffAnalysis/commands/TradeoffCommand.java
+++ b/plugins/org.polarsys.chess.tradeoffAnalysis/src/org/polarsys/chess/tradeoffAnalysis/commands/TradeoffCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.tradeoffAnalysis/src/org/polarsys/chess/tradeoffAnalysis/dialogs/ConfigurationSelectionDialog.java b/plugins/org.polarsys.chess.tradeoffAnalysis/src/org/polarsys/chess/tradeoffAnalysis/dialogs/ConfigurationSelectionDialog.java
index c1ecf24..3e5e065 100644
--- a/plugins/org.polarsys.chess.tradeoffAnalysis/src/org/polarsys/chess/tradeoffAnalysis/dialogs/ConfigurationSelectionDialog.java
+++ b/plugins/org.polarsys.chess.tradeoffAnalysis/src/org/polarsys/chess/tradeoffAnalysis/dialogs/ConfigurationSelectionDialog.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.tradeoffAnalysis/src/org/polarsys/chess/tradeoffAnalysis/views/TradeoffView.java b/plugins/org.polarsys.chess.tradeoffAnalysis/src/org/polarsys/chess/tradeoffAnalysis/views/TradeoffView.java
index ed8d4a9..953e490 100644
--- a/plugins/org.polarsys.chess.tradeoffAnalysis/src/org/polarsys/chess/tradeoffAnalysis/views/TradeoffView.java
+++ b/plugins/org.polarsys.chess.tradeoffAnalysis/src/org/polarsys/chess/tradeoffAnalysis/views/TradeoffView.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (C) 2018 Fondazione Bruno Kessler.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     Luca Cristoforetti - initial API and implementation
diff --git a/plugins/org.polarsys.chess.validator/about.html b/plugins/org.polarsys.chess.validator/about.html
index dd3c089..164f781 100644
--- a/plugins/org.polarsys.chess.validator/about.html
+++ b/plugins/org.polarsys.chess.validator/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>November 14, 2008</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.validator/license/Copyright.txt b/plugins/org.polarsys.chess.validator/license/Copyright.txt
index 48804d8..1f244db 100644
--- a/plugins/org.polarsys.chess.validator/license/Copyright.txt
+++ b/plugins/org.polarsys.chess.validator/license/Copyright.txt
@@ -9,5 +9,5 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/Activator.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/Activator.java
index 9259e4a..1cde09a 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/Activator.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/Activator.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 package org.polarsys.chess.validator;
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/automatedActions/IAutomatedAction.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/automatedActions/IAutomatedAction.java
index 0af410d..035cbd2 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/automatedActions/IAutomatedAction.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/automatedActions/IAutomatedAction.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/command/CHESSCoreValidationHandler.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/command/CHESSCoreValidationHandler.java
index 894282a..7f11539 100644
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/command/CHESSCoreValidationHandler.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/command/CHESSCoreValidationHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Intecs.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    Stefano Puri, stefano.puri@intecs.it
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/command/ChessGenericValidateCommand.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/command/ChessGenericValidateCommand.java
index 86ce61c..c57deb4 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/command/ChessGenericValidateCommand.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/command/ChessGenericValidateCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Intecs.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    Stefano Puri, stefano.puri@intecs.it
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/command/util/ChessGenericDiagnostician.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/command/util/ChessGenericDiagnostician.java
index 62bd92d..e937dc1 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/command/util/ChessGenericDiagnostician.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/command/util/ChessGenericDiagnostician.java
@@ -1,51 +1,58 @@
-package org.polarsys.chess.validator.command.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.common.util.DiagnosticChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.Diagnostician;
-import org.eclipse.emf.ecore.util.EObjectValidator;
-import org.eclipse.emf.validation.service.IConstraintFilter;
-
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class ChessGenericDiagnostician.
- * 
- * @see package org.eclipse.emf.ecore.util.Diagnostician
- */
-public class ChessGenericDiagnostician extends Diagnostician {
-
-	/** The eChessValidatorAdapter. */
-	private ChessValidatorAdapter eChessValidatorAdapter;
-	
-	/**
-	 * Instantiates a new chess generic diagnostician.
-	 *
-	 * @param filter the filter
-	 */
-	public ChessGenericDiagnostician(IConstraintFilter filter) {
-		this.eChessValidatorAdapter = new ChessValidatorAdapter(filter);
-	}
-		
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.util.Diagnostician#validate(org.eclipse.emf.ecore.EClass, org.eclipse.emf.ecore.EObject, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 */
-	@Override
-	public boolean validate(EClass eClass, EObject eObject, DiagnosticChain diagnostics, Map<Object, Object> context)
-    {
-		//progressMonitor.worked(1);
-		//System.err.println("This is the ChessCheckerDiagnostician override of Diagnostician.validate(EClass, EObject,diagnostics,context)");
-			    
-	    boolean circular = context.get(EObjectValidator.ROOT_OBJECT) == eObject;
-	    @SuppressWarnings("null")
-	    boolean result = eChessValidatorAdapter.validate(eClass, eObject, diagnostics, context);
-	    if ((result || diagnostics != null) && !circular)
-	    {
-	      result &= doValidateContents(eObject, diagnostics, context);
-	    }
-	    return result;
-	  }
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+package org.polarsys.chess.validator.command.util;

+

+import java.util.Map;

+

+import org.eclipse.emf.common.util.DiagnosticChain;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.util.Diagnostician;

+import org.eclipse.emf.ecore.util.EObjectValidator;

+import org.eclipse.emf.validation.service.IConstraintFilter;

+

+

+// TODO: Auto-generated Javadoc

+/**

+ * The Class ChessGenericDiagnostician.

+ * 

+ * @see package org.eclipse.emf.ecore.util.Diagnostician

+ */

+public class ChessGenericDiagnostician extends Diagnostician {

+

+	/** The eChessValidatorAdapter. */

+	private ChessValidatorAdapter eChessValidatorAdapter;

+	

+	/**

+	 * Instantiates a new chess generic diagnostician.

+	 *

+	 * @param filter the filter

+	 */

+	public ChessGenericDiagnostician(IConstraintFilter filter) {

+		this.eChessValidatorAdapter = new ChessValidatorAdapter(filter);

+	}

+		

+	/* (non-Javadoc)

+	 * @see org.eclipse.emf.ecore.util.Diagnostician#validate(org.eclipse.emf.ecore.EClass, org.eclipse.emf.ecore.EObject, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

+	 */

+	@Override

+	public boolean validate(EClass eClass, EObject eObject, DiagnosticChain diagnostics, Map<Object, Object> context)

+    {

+		//progressMonitor.worked(1);

+		//System.err.println("This is the ChessCheckerDiagnostician override of Diagnostician.validate(EClass, EObject,diagnostics,context)");

+			    

+	    boolean circular = context.get(EObjectValidator.ROOT_OBJECT) == eObject;

+	    @SuppressWarnings("null")

+	    boolean result = eChessValidatorAdapter.validate(eClass, eObject, diagnostics, context);

+	    if ((result || diagnostics != null) && !circular)

+	    {

+	      result &= doValidateContents(eObject, diagnostics, context);

+	    }

+	    return result;

+	  }

+}

diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/command/util/ChessValidatorAdapter.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/command/util/ChessValidatorAdapter.java
index 21ec237..8b92711 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/command/util/ChessValidatorAdapter.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/command/util/ChessValidatorAdapter.java
@@ -1,142 +1,149 @@
-package org.polarsys.chess.validator.command.util;
-
-import java.util.Map;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.BasicDiagnostic;
-import org.eclipse.emf.common.util.DiagnosticChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EObjectValidator;
-import org.eclipse.emf.validation.model.EvaluationMode;
-import org.eclipse.emf.validation.model.IConstraintStatus;
-import org.eclipse.emf.validation.service.IBatchValidator;
-import org.eclipse.emf.validation.service.IConstraintFilter;
-import org.eclipse.emf.validation.service.ModelValidationService;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class ChessValidatorAdapter.
- */
-public class ChessValidatorAdapter extends EObjectValidator{ 
-	
-	/** The batch validator. */
-	private final IBatchValidator batchValidator;
-
-	/**
-	 * Instantiates a new chess validator adapter.
-	 *
-	 * @param constraintFilter the constraint filter
-	 */
-	public ChessValidatorAdapter(IConstraintFilter constraintFilter) {
-		super();
-
-		this.batchValidator = (IBatchValidator) ModelValidationService.getInstance()
-				.newValidator(EvaluationMode.BATCH);
-		this.batchValidator.setIncludeLiveConstraints(true);
-		this.batchValidator.setReportSuccesses(false);
-		this.batchValidator.addConstraintFilter(constraintFilter);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.util.EObjectValidator#validate(org.eclipse.emf.ecore.EObject, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 */
-	@Override
-	public boolean validate(final EObject eObject,
-			final DiagnosticChain diagnostics,
-			final Map<Object, Object> context) {
-		return validate(eObject.eClass(), eObject, diagnostics, context);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.util.EObjectValidator#validate(org.eclipse.emf.ecore.EClass, org.eclipse.emf.ecore.EObject, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 */
-	@Override
-	public boolean validate(final EClass eClass, final EObject eObject,
-			final DiagnosticChain diagnostics, final Map<Object, Object> context) {
-        super.validate(eClass, eObject, diagnostics, context);
-        
-        IStatus status = Status.OK_STATUS;
-        
-        if (diagnostics != null) {
-            if (!hasProcessed(eObject, context)) {
-                status = this.batchValidator.validate(
-                    eObject,
-                    new NullProgressMonitor());
-                
-                processed(eObject, context, status);
-                
-                appendDiagnostics(status, diagnostics);
-            }
-        }
-        
-        return status.isOK();
-    }
-
-	/**
-	 * Processed.
-	 *
-	 * @param eObject the e object
-	 * @param context the context
-	 * @param status the status
-	 */
-	private void processed(final EObject eObject,
-			final Map<Object, Object> context, final IStatus status) {
-        if (context != null) {
-            context.put(eObject, status);
-        }
-    }
-    
-	/**
-	 * Checks for processed.
-	 *
-	 * @param eObject the e object
-	 * @param context the context
-	 * @return true, if successful
-	 */
-	private boolean hasProcessed(final EObject eObject,
-			final Map<Object, Object> context) {
-        boolean result = false;
-        EObject currentEObject = eObject;
-        if (context != null) {
-            while (currentEObject != null) {
-                if (context.containsKey(currentEObject)) {
-                    result = true;
-                    currentEObject = null;
-                } else {
-                    currentEObject = currentEObject.eContainer();
-                }
-            }
-        }
-        
-        return result;
-    }
-    
-	/**
-	 * Append diagnostics.
-	 *
-	 * @param status the status
-	 * @param diagnostics the diagnostics
-	 */
-	private void appendDiagnostics(final IStatus status,
-			final DiagnosticChain diagnostics) {
-        if (status.isMultiStatus()) {
-            IStatus[] children = status.getChildren();
-            
-            for (int i = 0; i < children.length; i++) {
-                appendDiagnostics(children[i], diagnostics);
-            }
-        } else if (status instanceof IConstraintStatus) {
-            diagnostics.add(new BasicDiagnostic(
-                status.getSeverity(),
-                status.getPlugin(),
-                status.getCode(),
-                status.getMessage(),
-                ((IConstraintStatus) status).getResultLocus().toArray()));
-        }
-    }
-
-
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+package org.polarsys.chess.validator.command.util;

+

+import java.util.Map;

+

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.NullProgressMonitor;

+import org.eclipse.core.runtime.Status;

+import org.eclipse.emf.common.util.BasicDiagnostic;

+import org.eclipse.emf.common.util.DiagnosticChain;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.util.EObjectValidator;

+import org.eclipse.emf.validation.model.EvaluationMode;

+import org.eclipse.emf.validation.model.IConstraintStatus;

+import org.eclipse.emf.validation.service.IBatchValidator;

+import org.eclipse.emf.validation.service.IConstraintFilter;

+import org.eclipse.emf.validation.service.ModelValidationService;

+

+// TODO: Auto-generated Javadoc

+/**

+ * The Class ChessValidatorAdapter.

+ */

+public class ChessValidatorAdapter extends EObjectValidator{ 

+	

+	/** The batch validator. */

+	private final IBatchValidator batchValidator;

+

+	/**

+	 * Instantiates a new chess validator adapter.

+	 *

+	 * @param constraintFilter the constraint filter

+	 */

+	public ChessValidatorAdapter(IConstraintFilter constraintFilter) {

+		super();

+

+		this.batchValidator = (IBatchValidator) ModelValidationService.getInstance()

+				.newValidator(EvaluationMode.BATCH);

+		this.batchValidator.setIncludeLiveConstraints(true);

+		this.batchValidator.setReportSuccesses(false);

+		this.batchValidator.addConstraintFilter(constraintFilter);

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.emf.ecore.util.EObjectValidator#validate(org.eclipse.emf.ecore.EObject, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

+	 */

+	@Override

+	public boolean validate(final EObject eObject,

+			final DiagnosticChain diagnostics,

+			final Map<Object, Object> context) {

+		return validate(eObject.eClass(), eObject, diagnostics, context);

+	}

+	

+	/* (non-Javadoc)

+	 * @see org.eclipse.emf.ecore.util.EObjectValidator#validate(org.eclipse.emf.ecore.EClass, org.eclipse.emf.ecore.EObject, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

+	 */

+	@Override

+	public boolean validate(final EClass eClass, final EObject eObject,

+			final DiagnosticChain diagnostics, final Map<Object, Object> context) {

+        super.validate(eClass, eObject, diagnostics, context);

+        

+        IStatus status = Status.OK_STATUS;

+        

+        if (diagnostics != null) {

+            if (!hasProcessed(eObject, context)) {

+                status = this.batchValidator.validate(

+                    eObject,

+                    new NullProgressMonitor());

+                

+                processed(eObject, context, status);

+                

+                appendDiagnostics(status, diagnostics);

+            }

+        }

+        

+        return status.isOK();

+    }

+

+	/**

+	 * Processed.

+	 *

+	 * @param eObject the e object

+	 * @param context the context

+	 * @param status the status

+	 */

+	private void processed(final EObject eObject,

+			final Map<Object, Object> context, final IStatus status) {

+        if (context != null) {

+            context.put(eObject, status);

+        }

+    }

+    

+	/**

+	 * Checks for processed.

+	 *

+	 * @param eObject the e object

+	 * @param context the context

+	 * @return true, if successful

+	 */

+	private boolean hasProcessed(final EObject eObject,

+			final Map<Object, Object> context) {

+        boolean result = false;

+        EObject currentEObject = eObject;

+        if (context != null) {

+            while (currentEObject != null) {

+                if (context.containsKey(currentEObject)) {

+                    result = true;

+                    currentEObject = null;

+                } else {

+                    currentEObject = currentEObject.eContainer();

+                }

+            }

+        }

+        

+        return result;

+    }

+    

+	/**

+	 * Append diagnostics.

+	 *

+	 * @param status the status

+	 * @param diagnostics the diagnostics

+	 */

+	private void appendDiagnostics(final IStatus status,

+			final DiagnosticChain diagnostics) {

+        if (status.isMultiStatus()) {

+            IStatus[] children = status.getChildren();

+            

+            for (int i = 0; i < children.length; i++) {

+                appendDiagnostics(children[i], diagnostics);

+            }

+        } else if (status instanceof IConstraintStatus) {

+            diagnostics.add(new BasicDiagnostic(

+                status.getSeverity(),

+                status.getPlugin(),

+                status.getCode(),

+                status.getMessage(),

+                ((IConstraintStatus) status).getResultLocus().toArray()));

+        }

+    }

+

+

+}

diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/AV_03.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/AV_03.java
index 8d12d9e..b891a2e 100644
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/AV_03.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/AV_03.java
@@ -11,7 +11,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 package org.polarsys.chess.validator.constraints;
@@ -36,7 +36,7 @@
 /**
  * The Class AV_03.
  * This class implements the following constraint (invoked by the EMF validation framework):
- * the SaAnalysisContext classifier in the Analysis View must have its “Platform” property 
+ * the SaAnalysisContext classifier in the Analysis View must have its �Platform� property 
  * valued with a CHGaResourcePlatform that is a Package in the Component View.
  * @since 0.10
  */
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/ArincProc_01.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/ArincProc_01.java
index 164d78d..3241049 100644
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/ArincProc_01.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/ArincProc_01.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 package org.polarsys.chess.validator.constraints;
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/Connector_01.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/Connector_01.java
index 363556e..f2d49fd 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/Connector_01.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/Connector_01.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 package org.polarsys.chess.validator.constraints;
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/Connector_02.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/Connector_02.java
index d56da51..4d26bfc 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/Connector_02.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/Connector_02.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/Connector_03.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/Connector_03.java
index b49ac9f..b769585 100644
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/Connector_03.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/Connector_03.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_01.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_01.java
index f67fa09..f136d2e 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_01.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_01.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 package org.polarsys.chess.validator.constraints;
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_02.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_02.java
index bee6558..6ae3bc9 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_02.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_02.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 package org.polarsys.chess.validator.constraints;
@@ -29,7 +29,7 @@
 
 /**
  * The Class DV_02.
- * DV_02 checks that the attribute “from” and “to” of stereotype Assign must be valued with exactly 
+ * DV_02 checks that the attribute �from� and �to� of stereotype Assign must be valued with exactly 
  * one value on each end and with the correct types: 
  * the value of the attribute 'from' in stereotype Assign must be an instance (InstanceSpecification) 
  * of a ComponentImplementation or of a Functional Partition or a <<CHRtPortSlot>> Slot. 
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_03.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_03.java
index 9430d23..644bea1 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_03.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_03.java
@@ -7,7 +7,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 package org.polarsys.chess.validator.constraints;
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_04.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_04.java
index dd9259b..07961cb 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_04.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_04.java
@@ -7,7 +7,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 package org.polarsys.chess.validator.constraints;
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_05.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_05.java
index 65bbc5b..5825706 100644
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_05.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_05.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 package org.polarsys.chess.validator.constraints;
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_06.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_06.java
index 3274dfb..18d920c 100644
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_06.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_06.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 package org.polarsys.chess.validator.constraints;
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_01.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_01.java
index 11335e2..d6e6cce 100644
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_01.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_01.java
@@ -11,7 +11,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 package org.polarsys.chess.validator.constraints;
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_02.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_02.java
index 0696cf7..08d95c2 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_02.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_02.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 package org.polarsys.chess.validator.constraints;
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_02_1.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_02_1.java
index 598b6f8..db87e9d 100644
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_02_1.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_02_1.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 package org.polarsys.chess.validator.constraints;
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_03.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_03.java
index 784b3aa..0dcde68 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_03.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_03.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 package org.polarsys.chess.validator.constraints;
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_04.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_04.java
index ae93d98..172c4ea 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_04.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_04.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 package org.polarsys.chess.validator.constraints;
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_20.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_20.java
index 1a68bf2..5b93e3d 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_20.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_20.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 package org.polarsys.chess.validator.constraints;
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_30.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_30.java
index 9f311e6..57ca43d 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_30.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_30.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 package org.polarsys.chess.validator.constraints;
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_40.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_40.java
index 9cc747d..ab97cb8 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_40.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_40.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 package org.polarsys.chess.validator.constraints;
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FV_02.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FV_02.java
index 1fafc3d..c0d65f5 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FV_02.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FV_02.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 package org.polarsys.chess.validator.constraints;
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FV_03.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FV_03.java
index 42a90ca..6dadced 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FV_03.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FV_03.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 package org.polarsys.chess.validator.constraints;
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FV_04.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FV_04.java
index be5453e..772425f 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FV_04.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FV_04.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 package org.polarsys.chess.validator.constraints;
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FV_05.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FV_05.java
index 752c199..9c7eed7 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FV_05.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FV_05.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 package org.polarsys.chess.validator.constraints;
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FV_06.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FV_06.java
index aacd6a3..fc5bdb4 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FV_06.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FV_06.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 package org.polarsys.chess.validator.constraints;
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FV_07.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FV_07.java
index 302c092..b326dda 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FV_07.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FV_07.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 package org.polarsys.chess.validator.constraints;
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FlowPorts_01.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FlowPorts_01.java
index fc27000..3191d98 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FlowPorts_01.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FlowPorts_01.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FlowPorts_02.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FlowPorts_02.java
index 4872f13..1ca6f9c 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FlowPorts_02.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FlowPorts_02.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FlowPorts_03.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FlowPorts_03.java
index e7dabbc..0c05091 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FlowPorts_03.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/FlowPorts_03.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/StringParser.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/StringParser.java
index 7c6d0ff..28d3e01 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/StringParser.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/StringParser.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 package org.polarsys.chess.validator.constraints;
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/libs/ActionsLib.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/libs/ActionsLib.java
index bc5aa16..cb72828 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/libs/ActionsLib.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/libs/ActionsLib.java
@@ -11,7 +11,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/libs/ConstraintsLib.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/libs/ConstraintsLib.java
index 13c5771..7f41929 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/libs/ConstraintsLib.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/libs/ConstraintsLib.java
@@ -12,7 +12,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/libs/CrossViewActionLib.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/libs/CrossViewActionLib.java
index c072c8a..bc02c6a 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/libs/CrossViewActionLib.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/libs/CrossViewActionLib.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/managers/AddDiagramElement.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/managers/AddDiagramElement.java
index acd21a7..d3fa24f 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/managers/AddDiagramElement.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/managers/AddDiagramElement.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/managers/ModelManager.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/managers/ModelManager.java
index 883223c..4f0fd28 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/managers/ModelManager.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/managers/ModelManager.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/managers/ModelParser.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/managers/ModelParser.java
index 723024d..da68812 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/managers/ModelParser.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/managers/ModelParser.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
  */
 
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/managers/ResourceListener.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/managers/ResourceListener.java
index a0087a2..9453a33 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/managers/ResourceListener.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/managers/ResourceListener.java
@@ -8,7 +8,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/managers/ValidationDelegateClientSelector.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/managers/ValidationDelegateClientSelector.java
index 63685b8..101b100 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/managers/ValidationDelegateClientSelector.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/managers/ValidationDelegateClientSelector.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 package org.polarsys.chess.validator.managers;
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/managers/ViewManager.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/managers/ViewManager.java
index d18c227..8c1fd07 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/managers/ViewManager.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/managers/ViewManager.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/messages/Messages.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/messages/Messages.java
index 46f8323..7f92d76 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/messages/Messages.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/messages/Messages.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */
 
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/messages/messages.properties b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/messages/messages.properties
index c18d51e..b9fcdfc 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/messages/messages.properties
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/messages/messages.properties
@@ -1,14 +1,21 @@
-error_diagramInView=Diagrams must be created inside the views
-error_diagramCurrentView=This diagram is not allowed in the current view
-NullViewMsg=Can't modify the model outside the views
-ModelManager_1=Deleting a view is forbidden.
-ViewDeletionMsg=Can't delete view from the model\!
-ModelManager_2=Model root must contains only the views.
-ModelManager_3=Appling a view stereotype is forbidden.
-ModelManager_4=Creation of interfaces is only allowed in the Functional View.
-ModelManager_5=Creation of component with no additional stereotypes is only allowed in the Functional View.
-ModelManager_6=Operations in the Functional View must have public visibility.
-ModelManager_7=Interface realization is not allowed because owned operations does not match.
-ModelManager_8=This element does not belong to the current view and cannot be therefore modified.
-ModelManager_9=A predefined stereotype cannot be removed.
-operationAborted=Operation aborted by the user
+#-------------------------------------------------------------------------------

+# Copyright (C) 2020 

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v2.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v20.html

+#-------------------------------------------------------------------------------

+error_diagramInView=Diagrams must be created inside the views

+error_diagramCurrentView=This diagram is not allowed in the current view

+NullViewMsg=Can't modify the model outside the views

+ModelManager_1=Deleting a view is forbidden.

+ViewDeletionMsg=Can't delete view from the model\!

+ModelManager_2=Model root must contains only the views.

+ModelManager_3=Appling a view stereotype is forbidden.

+ModelManager_4=Creation of interfaces is only allowed in the Functional View.

+ModelManager_5=Creation of component with no additional stereotypes is only allowed in the Functional View.

+ModelManager_6=Operations in the Functional View must have public visibility.

+ModelManager_7=Interface realization is not allowed because owned operations does not match.

+ModelManager_8=This element does not belong to the current view and cannot be therefore modified.

+ModelManager_9=A predefined stereotype cannot be removed.

+operationAborted=Operation aborted by the user

diff --git a/plugins/org.polarsys.chess.wizards/about.html b/plugins/org.polarsys.chess.wizards/about.html
index dd3c089..164f781 100644
--- a/plugins/org.polarsys.chess.wizards/about.html
+++ b/plugins/org.polarsys.chess.wizards/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>November 14, 2008</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.wizards/plugin.properties b/plugins/org.polarsys.chess.wizards/plugin.properties
index 0b4a523..0a44e87 100644
--- a/plugins/org.polarsys.chess.wizards/plugin.properties
+++ b/plugins/org.polarsys.chess.wizards/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2008 Obeo.
 # All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     Obeo - initial API and implementation
diff --git a/plugins/org.polarsys.chess.wizards/src/org/polarsys/chess/wizards/Activator.java b/plugins/org.polarsys.chess.wizards/src/org/polarsys/chess/wizards/Activator.java
index f492d85..f1ba8e5 100644
--- a/plugins/org.polarsys.chess.wizards/src/org/polarsys/chess/wizards/Activator.java
+++ b/plugins/org.polarsys.chess.wizards/src/org/polarsys/chess/wizards/Activator.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 */package org.polarsys.chess.wizards;
 
diff --git a/plugins/org.polarsys.chess.wizards/src/org/polarsys/chess/wizards/providers/WorkspaceNewModelStorageProvider.java b/plugins/org.polarsys.chess.wizards/src/org/polarsys/chess/wizards/providers/WorkspaceNewModelStorageProvider.java
index c0a6ac0..53b31fa 100644
--- a/plugins/org.polarsys.chess.wizards/src/org/polarsys/chess/wizards/providers/WorkspaceNewModelStorageProvider.java
+++ b/plugins/org.polarsys.chess.wizards/src/org/polarsys/chess/wizards/providers/WorkspaceNewModelStorageProvider.java
@@ -1,173 +1,180 @@
-package org.polarsys.chess.wizards.providers;
-
-import static org.eclipse.papyrus.uml.diagram.wizards.utils.WizardsHelper.adapt;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.ui.URIEditorInput;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.papyrus.uml.diagram.wizards.pages.NewModelFilePage;
-import org.eclipse.papyrus.uml.diagram.wizards.utils.WizardsHelper;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.part.FileEditorInput;
-import org.polarsys.chess.wizards.wizards.CreateCHESSModelWizard;
-import org.polarsys.chess.wizards.wizards.InitModelWizard.NewDiagramForExistingModelPage;
-
-/**
- * The Class WorkspaceNewModelStorageProvider.
- */
-public class WorkspaceNewModelStorageProvider {
-
-	/** The wizard. */
-	private CreateCHESSModelWizard wizard;
-
-	/** The new model file page. */
-	private NewModelFilePage newModelFilePage;
-
-	/**
-	 * Instantiates a new workspace new model storage provider.
-	 */
-	public WorkspaceNewModelStorageProvider() {
-		super();
-	}
-
-	/**
-	 * Checks if the WorkspaceNewModelStorageProvider can handle the structured selection in input
-	 *
-	 * @param initialSelection the initial structured selection
-	 * @return true, if successful
-	 */
-	public boolean canHandle(IStructuredSelection initialSelection) {
-		boolean result = false;
-
-		for(Object next : initialSelection.toList()) {
-			if(adapt(next, IResource.class) != null) {
-				result = true;
-				break;
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * Initializes the wizard.
-	 *
-	 * @param wizard the wizard
-	 * @param selection the selection
-	 */
-	public void init(CreateCHESSModelWizard wizard, IStructuredSelection selection) {
-		this.wizard = wizard;
-		newModelFilePage = createNewModelFilePage(selection);
-	}
-
-	/**
-	 * Creates the wizard pages.
-	 *
-	 * @return the list of wizards pages
-	 */
-	public List<? extends IWizardPage> createPages() {
-		if(newModelFilePage == null) {
-			return Collections.emptyList();
-		}
-
-		return Arrays.asList(newModelFilePage);
-	}
-
-	/**
-	 * Validates the diagram categories.
-	 *
-	 * @param newCategories the new categories
-	 * @return the status of the validation
-	 */
-	public IStatus validateDiagramCategories(String... newCategories) {
-		if(newModelFilePage != null) {
-			String firstCategory = newCategories.length > 0 ? newCategories[0] : null;
-			if(newCategories.length > 0) {
-				return newModelFilePage.diagramExtensionChanged(wizard.getDiagramFileExtension(firstCategory));
-			}
-		}
-
-		return Status.OK_STATUS;
-	}
-
-
-	/**
-	 * Creates the new model file page.
-	 *
-	 * @param selection the current structured selection
-	 * @return the new model file page
-	 */
-	protected NewModelFilePage createNewModelFilePage(IStructuredSelection selection) {
-
-		if(wizard.isCreateProjectWizard() || wizard.isCreateMultipleModelsWizard()) {
-
-			return null;
-		}
-
-		//		IFile selectedFile = getSelectedFile(selection);
-		URI selectedResourceURI = WizardsHelper.getSelectedResourceURI(selection);
-
-		if(isCreateFromExistingDomainModel() && selectedResourceURI != null) {
-			return new NewDiagramForExistingModelPage(selection, wizard.getModelKindName(), getDiagramFileName(selectedResourceURI) + "." + wizard.getDiagramFileExtension(null), wizard.getDiagramFileExtension(null)); //$NON-NLS-1$
-		}
-
-		return new NewModelFilePage(selection, wizard.getModelKindName());
-	}
-
-	/**
-	 * Gets the diagram file name.
-	 *
-	 * @param domainModelURI the domain model URI
-	 * @return the diagram file name
-	 */
-	protected String getDiagramFileName(URI domainModelURI) {
-		return domainModelURI.trimFileExtension().lastSegment();
-	}
-
-	/**
-	 * Checks if the wizards creates the from existing domain model.
-	 *
-	 * @return false
-	 */
-	protected boolean isCreateFromExistingDomainModel() {
-		return false;
-	}
-
-	/**
-	 * Creates the new model URI
-	 *
-	 * @param categoryId the category id
-	 * @return the URI
-	 */
-	public URI createNewModelURI(String categoryId) {
-		IFile newFile = newModelFilePage.createNewFile();
-		return (newFile == null) ? null : URI.createPlatformResourceURI(newFile.getFullPath().toString(), true);
-	}
-	
-	/**
-	 * Creates the editor input.
-	 *
-	 * @param uri the URI
-	 * @return the editor input
-	 */
-	public IEditorInput createEditorInput(URI uri) {
-		if (uri.isPlatformResource()) {
-			return new FileEditorInput(ResourcesPlugin.getWorkspace().getRoot()
-				.getFile(new Path(uri.toPlatformString(true))));
-		} else {
-			return new URIEditorInput(uri);
-		}
-	}
-
-}
+/*******************************************************************************

+ * Copyright (C) 2020 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v2.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v20.html

+ ******************************************************************************/

+package org.polarsys.chess.wizards.providers;

+

+import static org.eclipse.papyrus.uml.diagram.wizards.utils.WizardsHelper.adapt;

+

+import java.util.Arrays;

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IResource;

+import org.eclipse.core.resources.ResourcesPlugin;

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.Path;

+import org.eclipse.core.runtime.Status;

+import org.eclipse.emf.common.ui.URIEditorInput;

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.jface.wizard.IWizardPage;

+import org.eclipse.papyrus.uml.diagram.wizards.pages.NewModelFilePage;

+import org.eclipse.papyrus.uml.diagram.wizards.utils.WizardsHelper;

+import org.eclipse.ui.IEditorInput;

+import org.eclipse.ui.part.FileEditorInput;

+import org.polarsys.chess.wizards.wizards.CreateCHESSModelWizard;

+import org.polarsys.chess.wizards.wizards.InitModelWizard.NewDiagramForExistingModelPage;

+

+/**

+ * The Class WorkspaceNewModelStorageProvider.

+ */

+public class WorkspaceNewModelStorageProvider {

+

+	/** The wizard. */

+	private CreateCHESSModelWizard wizard;

+

+	/** The new model file page. */

+	private NewModelFilePage newModelFilePage;

+

+	/**

+	 * Instantiates a new workspace new model storage provider.

+	 */

+	public WorkspaceNewModelStorageProvider() {

+		super();

+	}

+

+	/**

+	 * Checks if the WorkspaceNewModelStorageProvider can handle the structured selection in input

+	 *

+	 * @param initialSelection the initial structured selection

+	 * @return true, if successful

+	 */

+	public boolean canHandle(IStructuredSelection initialSelection) {

+		boolean result = false;

+

+		for(Object next : initialSelection.toList()) {

+			if(adapt(next, IResource.class) != null) {

+				result = true;

+				break;

+			}

+		}

+

+		return result;

+	}

+

+	/**

+	 * Initializes the wizard.

+	 *

+	 * @param wizard the wizard

+	 * @param selection the selection

+	 */

+	public void init(CreateCHESSModelWizard wizard, IStructuredSelection selection) {

+		this.wizard = wizard;

+		newModelFilePage = createNewModelFilePage(selection);

+	}

+

+	/**

+	 * Creates the wizard pages.

+	 *

+	 * @return the list of wizards pages

+	 */

+	public List<? extends IWizardPage> createPages() {

+		if(newModelFilePage == null) {

+			return Collections.emptyList();

+		}

+

+		return Arrays.asList(newModelFilePage);

+	}

+

+	/**

+	 * Validates the diagram categories.

+	 *

+	 * @param newCategories the new categories

+	 * @return the status of the validation

+	 */

+	public IStatus validateDiagramCategories(String... newCategories) {

+		if(newModelFilePage != null) {

+			String firstCategory = newCategories.length > 0 ? newCategories[0] : null;

+			if(newCategories.length > 0) {

+				return newModelFilePage.diagramExtensionChanged(wizard.getDiagramFileExtension(firstCategory));

+			}

+		}

+

+		return Status.OK_STATUS;

+	}

+

+

+	/**

+	 * Creates the new model file page.

+	 *

+	 * @param selection the current structured selection

+	 * @return the new model file page

+	 */

+	protected NewModelFilePage createNewModelFilePage(IStructuredSelection selection) {

+

+		if(wizard.isCreateProjectWizard() || wizard.isCreateMultipleModelsWizard()) {

+

+			return null;

+		}

+

+		//		IFile selectedFile = getSelectedFile(selection);

+		URI selectedResourceURI = WizardsHelper.getSelectedResourceURI(selection);

+

+		if(isCreateFromExistingDomainModel() && selectedResourceURI != null) {

+			return new NewDiagramForExistingModelPage(selection, wizard.getModelKindName(), getDiagramFileName(selectedResourceURI) + "." + wizard.getDiagramFileExtension(null), wizard.getDiagramFileExtension(null)); //$NON-NLS-1$

+		}

+

+		return new NewModelFilePage(selection, wizard.getModelKindName());

+	}

+

+	/**

+	 * Gets the diagram file name.

+	 *

+	 * @param domainModelURI the domain model URI

+	 * @return the diagram file name

+	 */

+	protected String getDiagramFileName(URI domainModelURI) {

+		return domainModelURI.trimFileExtension().lastSegment();

+	}

+

+	/**

+	 * Checks if the wizards creates the from existing domain model.

+	 *

+	 * @return false

+	 */

+	protected boolean isCreateFromExistingDomainModel() {

+		return false;

+	}

+

+	/**

+	 * Creates the new model URI

+	 *

+	 * @param categoryId the category id

+	 * @return the URI

+	 */

+	public URI createNewModelURI(String categoryId) {

+		IFile newFile = newModelFilePage.createNewFile();

+		return (newFile == null) ? null : URI.createPlatformResourceURI(newFile.getFullPath().toString(), true);

+	}

+	

+	/**

+	 * Creates the editor input.

+	 *

+	 * @param uri the URI

+	 * @return the editor input

+	 */

+	public IEditorInput createEditorInput(URI uri) {

+		if (uri.isPlatformResource()) {

+			return new FileEditorInput(ResourcesPlugin.getWorkspace().getRoot()

+				.getFile(new Path(uri.toPlatformString(true))));

+		} else {

+			return new URIEditorInput(uri);

+		}

+	}

+

+}

diff --git a/plugins/org.polarsys.chess.wizards/src/org/polarsys/chess/wizards/wizards/CHESSNewProjectWizard.java b/plugins/org.polarsys.chess.wizards/src/org/polarsys/chess/wizards/wizards/CHESSNewProjectWizard.java
index e3af1a3..7b1bc39 100644
--- a/plugins/org.polarsys.chess.wizards/src/org/polarsys/chess/wizards/wizards/CHESSNewProjectWizard.java
+++ b/plugins/org.polarsys.chess.wizards/src/org/polarsys/chess/wizards/wizards/CHESSNewProjectWizard.java
@@ -10,7 +10,7 @@
 -- 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                         --

+-- http://www.eclipse.org/legal/epl-v20.html                         --

 

 Contributor:

  Stefano Puri (Intecs) - support creating CHESS model

diff --git a/plugins/org.polarsys.chess.wizards/src/org/polarsys/chess/wizards/wizards/CreateCHESSModelWizard.java b/plugins/org.polarsys.chess.wizards/src/org/polarsys/chess/wizards/wizards/CreateCHESSModelWizard.java
index 01bdd9b..d40f034 100644
--- a/plugins/org.polarsys.chess.wizards/src/org/polarsys/chess/wizards/wizards/CreateCHESSModelWizard.java
+++ b/plugins/org.polarsys.chess.wizards/src/org/polarsys/chess/wizards/wizards/CreateCHESSModelWizard.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 
 */
diff --git a/plugins/org.polarsys.chess.wizards/src/org/polarsys/chess/wizards/wizards/InitModelWizard.java b/plugins/org.polarsys.chess.wizards/src/org/polarsys/chess/wizards/wizards/InitModelWizard.java
index e8d3afc..62fd7d3 100644
--- a/plugins/org.polarsys.chess.wizards/src/org/polarsys/chess/wizards/wizards/InitModelWizard.java
+++ b/plugins/org.polarsys.chess.wizards/src/org/polarsys/chess/wizards/wizards/InitModelWizard.java
@@ -10,7 +10,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 -----------------------------------------------------------------------
 
 */
diff --git a/plugins/org.polarsys.chess.xtext.global/about.html b/plugins/org.polarsys.chess.xtext.global/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/plugins/org.polarsys.chess.xtext.global/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.xtext.global/src/org/polarsys/chess/xtext/global/Activator.java b/plugins/org.polarsys.chess.xtext.global/src/org/polarsys/chess/xtext/global/Activator.java
index 1d940db..d26ee6f 100644
--- a/plugins/org.polarsys.chess.xtext.global/src/org/polarsys/chess/xtext/global/Activator.java
+++ b/plugins/org.polarsys.chess.xtext.global/src/org/polarsys/chess/xtext/global/Activator.java
@@ -2,9 +2,9 @@
  -
  - Copyright (c) 2013, 2015 Intecs SpA 
  - All rights reserved. This program and the accompanying materials
- - are made available under the terms of the Eclipse Public License v1.0
+ - are made available under the terms of the Eclipse Public License v2.0
  - which accompanies this distribution, and is available at
- - http://www.eclipse.org/legal/epl-v10.html
+ - http://www.eclipse.org/legal/epl-v20.html
  -
  - Contributors:
  - 
diff --git a/plugins/org.polarsys.chess.xtext.global/src/org/polarsys/chess/xtext/global/utils/XtextUtils.java b/plugins/org.polarsys.chess.xtext.global/src/org/polarsys/chess/xtext/global/utils/XtextUtils.java
index 1bd734e..f44cef7 100644
--- a/plugins/org.polarsys.chess.xtext.global/src/org/polarsys/chess/xtext/global/utils/XtextUtils.java
+++ b/plugins/org.polarsys.chess.xtext.global/src/org/polarsys/chess/xtext/global/utils/XtextUtils.java
@@ -2,9 +2,9 @@
  -
  - Copyright (c) 2013, 2015 Intecs SpA 
  - All rights reserved. This program and the accompanying materials
- - are made available under the terms of the Eclipse Public License v1.0
+ - are made available under the terms of the Eclipse Public License v2.0
  - which accompanies this distribution, and is available at
- - http://www.eclipse.org/legal/epl-v10.html
+ - http://www.eclipse.org/legal/epl-v20.html
  -
  - Contributors:
  - 
diff --git a/plugins/sba/org.polarsys.chess.statebased/ATL/CHESS2IM.atl b/plugins/sba/org.polarsys.chess.statebased/ATL/CHESS2IM.atl
index 0753ccc..b195d1a 100644
--- a/plugins/sba/org.polarsys.chess.statebased/ATL/CHESS2IM.atl
+++ b/plugins/sba/org.polarsys.chess.statebased/ATL/CHESS2IM.atl
@@ -5,7 +5,7 @@
 -- 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                         --

+-- http://www.eclipse.org/legal/epl-v20.html                         --

 --                                                                   --

 -- Contributors:                                                     --

 -- Leonardo Montecchi 	lmontecchi@unifi.it                          --

diff --git a/plugins/sba/org.polarsys.chess.statebased/ATL/IDM2PNML.atl b/plugins/sba/org.polarsys.chess.statebased/ATL/IDM2PNML.atl
index 5789851..da377eb 100644
--- a/plugins/sba/org.polarsys.chess.statebased/ATL/IDM2PNML.atl
+++ b/plugins/sba/org.polarsys.chess.statebased/ATL/IDM2PNML.atl
@@ -5,7 +5,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 --                                                                   --
 -- Contributors:                                                     --
 -- Leonardo Montecchi 	lmontecchi@unifi.it                          --
diff --git a/plugins/sba/org.polarsys.chess.statebased/ATL/PNML2DEEM.atl b/plugins/sba/org.polarsys.chess.statebased/ATL/PNML2DEEM.atl
index 47862e5..e5af6ee 100644
--- a/plugins/sba/org.polarsys.chess.statebased/ATL/PNML2DEEM.atl
+++ b/plugins/sba/org.polarsys.chess.statebased/ATL/PNML2DEEM.atl
@@ -5,7 +5,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 --                                                                   --
 -- Contributors:                                                     --
 -- Leonardo Montecchi 	lmontecchi@unifi.it                          --
diff --git a/plugins/sba/org.polarsys.chess.statebased/about.html b/plugins/sba/org.polarsys.chess.statebased/about.html
index dd3c089..164f781 100644
--- a/plugins/sba/org.polarsys.chess.statebased/about.html
+++ b/plugins/sba/org.polarsys.chess.statebased/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>November 14, 2008</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/plugins/sba/org.polarsys.chess.statebased/build.properties b/plugins/sba/org.polarsys.chess.statebased/build.properties
index 3aef476..344dba6 100644
--- a/plugins/sba/org.polarsys.chess.statebased/build.properties
+++ b/plugins/sba/org.polarsys.chess.statebased/build.properties
@@ -4,9 +4,9 @@
 # Intecs S.p.A., Italy
 #   
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 # Leonardo Montecchi	lmontecchi@unifi.it
diff --git a/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/Activator.java b/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/Activator.java
index 1dd0351..ba54f6a 100644
--- a/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/Activator.java
+++ b/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/Activator.java
@@ -7,7 +7,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 --                                                                   --
 -- Contributors:                                                     --
 -- Leonardo Montecchi 	lmontecchi@unifi.it                          --
diff --git a/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/DEEMClient.java b/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/DEEMClient.java
index cc7dfbb..066fe0e 100644
--- a/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/DEEMClient.java
+++ b/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/DEEMClient.java
@@ -6,7 +6,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 --                                                                   --
 -- Contributors:                                                     --
 -- Leonardo Montecchi 	lmontecchi@unifi.it                          --
diff --git a/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/DEEMProgressInformation.java b/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/DEEMProgressInformation.java
index d1fee07..aca2ee7 100644
--- a/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/DEEMProgressInformation.java
+++ b/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/DEEMProgressInformation.java
@@ -6,7 +6,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 --                                                                   --
 -- Contributors:                                                     --
 -- Leonardo Montecchi 	lmontecchi@unifi.it                          --
diff --git a/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/PeriodicExecutionDialog.java b/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/PeriodicExecutionDialog.java
index 464d22e..02d0d24 100644
--- a/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/PeriodicExecutionDialog.java
+++ b/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/PeriodicExecutionDialog.java
@@ -6,7 +6,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 --                                                                   --
 -- Contributors:                                                     --
 -- Leonardo Montecchi 	lmontecchi@unifi.it                          --
diff --git a/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/SelectionListenerForStateBased.java b/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/SelectionListenerForStateBased.java
index 5d570a6..ab6dc72 100644
--- a/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/SelectionListenerForStateBased.java
+++ b/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/SelectionListenerForStateBased.java
@@ -7,7 +7,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 --                                                                   --
 -- Contributors:                                                     --
 -- Nicholas Pacini		nicholas.pacini@intecs.it                    --
diff --git a/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/StateBasedSourceProvider.java b/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/StateBasedSourceProvider.java
index 60cbfea..034d51f 100644
--- a/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/StateBasedSourceProvider.java
+++ b/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/StateBasedSourceProvider.java
@@ -7,7 +7,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 --                                                                   --
 -- Contributors:                                                     --
 -- Nicholas Pacini		nicholas.pacini@intecs.it                    --
diff --git a/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/StateBasedTransformationCommand.java b/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/StateBasedTransformationCommand.java
index 45e46bd..dd1f6f3 100644
--- a/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/StateBasedTransformationCommand.java
+++ b/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/StateBasedTransformationCommand.java
@@ -7,7 +7,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 --                                                                   --
 -- Contributors:                                                     --
 -- Leonardo Montecchi 	lmontecchi@unifi.it                          --
diff --git a/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/StateBasedWithParametersCommand.java b/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/StateBasedWithParametersCommand.java
index 8188992..563f0ce 100644
--- a/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/StateBasedWithParametersCommand.java
+++ b/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/StateBasedWithParametersCommand.java
@@ -7,7 +7,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 --                                                                   --
 -- Contributors:                                                     --
 -- Leonardo Montecchi 	lmontecchi@unifi.it                          --
diff --git a/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/daemon/DEEMProgressInformation.java b/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/daemon/DEEMProgressInformation.java
index 6cbc8ca..9e00567 100644
--- a/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/daemon/DEEMProgressInformation.java
+++ b/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/daemon/DEEMProgressInformation.java
@@ -6,7 +6,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 --                                                                   --
 -- Contributors:                                                     --
 -- Leonardo Montecchi 	lmontecchi@unifi.it                          --
diff --git a/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/daemon/ParameterList.java b/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/daemon/ParameterList.java
index 9cc7740..3f68f18 100644
--- a/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/daemon/ParameterList.java
+++ b/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/daemon/ParameterList.java
@@ -6,7 +6,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 --                                                                   --
 -- Contributors:                                                     --
 -- Leonardo Montecchi 	lmontecchi@unifi.it                          --
diff --git a/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/preferences/StateBasedPreferencePage.java b/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/preferences/StateBasedPreferencePage.java
index 27fb783..10c7889 100644
--- a/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/preferences/StateBasedPreferencePage.java
+++ b/plugins/sba/org.polarsys.chess.statebased/src/org/polarsys/chess/statebased/preferences/StateBasedPreferencePage.java
@@ -7,7 +7,7 @@
 -- 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                         --
+-- http://www.eclipse.org/legal/epl-v20.html                         --
 --                                                                   --
 -- Contributors:                                                     --
 -- Leonardo Montecchi 	lmontecchi@unifi.it                          --