Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2014-08-20 11:02:21 +0000
committerCamille Letavernier2014-08-20 11:02:21 +0000
commitdc24d85a5d205075e4a253522ab5ee53e751e67b (patch)
tree4b8c56e5daf9231ea6cbc54b5f3c2ac3036fe6d0 /extraplugins/layout
parent4e36a9ea0c2024ace53d2d4015b6a1df0223fcf2 (diff)
downloadorg.eclipse.papyrus-dc24d85a5d205075e4a253522ab5ee53e751e67b.tar.gz
org.eclipse.papyrus-dc24d85a5d205075e4a253522ab5ee53e751e67b.tar.xz
org.eclipse.papyrus-dc24d85a5d205075e4a253522ab5ee53e751e67b.zip
[Extra] Update layout integration plug-ins metadata
Diffstat (limited to 'extraplugins/layout')
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.gridAlgorithm/.classpath2
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.gridAlgorithm/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.gridAlgorithm/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.gridAlgorithm/build.properties2
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalAlgorithm/.classpath2
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalAlgorithm/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalAlgorithm/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalAlgorithm/build.properties2
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalSymmetryAlgorithm/.classpath2
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalSymmetryAlgorithm/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalSymmetryAlgorithm/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalSymmetryAlgorithm/build.properties2
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalTreeAlgorithm/.classpath2
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalTreeAlgorithm/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalTreeAlgorithm/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalTreeAlgorithm/build.properties2
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.radialAlgorithm/.classpath2
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.radialAlgorithm/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.radialAlgorithm/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.radialAlgorithm/build.properties2
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.springAlgorithm/.classpath2
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.springAlgorithm/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.springAlgorithm/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.springAlgorithm/build.properties2
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.treeAlgorithm/.classpath2
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.treeAlgorithm/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.treeAlgorithm/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.treeAlgorithm/build.properties2
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalAlgorithm/.classpath2
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalAlgorithm/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalAlgorithm/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalAlgorithm/build.properties2
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalSymmetryAlgorithm/.classpath2
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalSymmetryAlgorithm/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalSymmetryAlgorithm/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalSymmetryAlgorithm/build.properties2
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout/.classpath2
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout/build.properties2
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout/plugin.xml4
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout/src/org/eclipse/papyrus/layout/LayoutToolToolbar.java68
-rw-r--r--extraplugins/layout/org.eclipse.papyrus.layout/src/org/eclipse/papyrus/layout/managealgorithms/ZestAlgortihms.java25
43 files changed, 110 insertions, 127 deletions
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.gridAlgorithm/.classpath b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.gridAlgorithm/.classpath
index 2d1a4302f04..8a8f1668cdc 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.gridAlgorithm/.classpath
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.gridAlgorithm/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.gridAlgorithm/.settings/org.eclipse.jdt.core.prefs b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.gridAlgorithm/.settings/org.eclipse.jdt.core.prefs
index 23aa1baa703..f287d53cf45 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.gridAlgorithm/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.gridAlgorithm/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
-#Mon May 25 10:53:10 CEST 2009
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.gridAlgorithm/META-INF/MANIFEST.MF b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.gridAlgorithm/META-INF/MANIFEST.MF
index 15e28374fb7..aba42c6fbae 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.gridAlgorithm/META-INF/MANIFEST.MF
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.gridAlgorithm/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@ Bundle-Activator: org.eclipse.papyrus.layout.algorithms.gridalgorithm.
Activator
Bundle-SymbolicName: org.eclipse.papyrus.layout.algorithms.gridAlgorit
hm;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.gridAlgorithm/build.properties b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.gridAlgorithm/build.properties
index a9ba701c271..1c6133a3b8a 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.gridAlgorithm/build.properties
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.gridAlgorithm/build.properties
@@ -2,6 +2,6 @@
#Thu Sep 15 16:42:19 CEST 2011
bin.includes=META-INF/,.,plugin.xml,icons/,about.html,plugin.properties
output..=bin/
-src.includes=META-INF/,.,plugin.xml,icons/,about.html,plugin.properties
+src.includes = about.html
source..=src/
bin..=bin/
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalAlgorithm/.classpath b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalAlgorithm/.classpath
index 2d1a4302f04..8a8f1668cdc 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalAlgorithm/.classpath
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalAlgorithm/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalAlgorithm/.settings/org.eclipse.jdt.core.prefs b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalAlgorithm/.settings/org.eclipse.jdt.core.prefs
index b3ca998794d..f287d53cf45 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalAlgorithm/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalAlgorithm/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
-#Tue May 26 16:28:31 CEST 2009
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalAlgorithm/META-INF/MANIFEST.MF b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalAlgorithm/META-INF/MANIFEST.MF
index 581bd25bc21..5bf7a834765 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalAlgorithm/META-INF/MANIFEST.MF
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalAlgorithm/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@ Bundle-Activator: org.eclipse.papyrus.layout.algorithms.horizontalalgo
rithm.Activator
Bundle-SymbolicName: org.eclipse.papyrus.layout.algorithms.horizontalA
lgorithm;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalAlgorithm/build.properties b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalAlgorithm/build.properties
index a9ba701c271..1c6133a3b8a 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalAlgorithm/build.properties
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalAlgorithm/build.properties
@@ -2,6 +2,6 @@
#Thu Sep 15 16:42:19 CEST 2011
bin.includes=META-INF/,.,plugin.xml,icons/,about.html,plugin.properties
output..=bin/
-src.includes=META-INF/,.,plugin.xml,icons/,about.html,plugin.properties
+src.includes = about.html
source..=src/
bin..=bin/
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalSymmetryAlgorithm/.classpath b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalSymmetryAlgorithm/.classpath
index 2d1a4302f04..8a8f1668cdc 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalSymmetryAlgorithm/.classpath
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalSymmetryAlgorithm/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalSymmetryAlgorithm/.settings/org.eclipse.jdt.core.prefs b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalSymmetryAlgorithm/.settings/org.eclipse.jdt.core.prefs
index 801a9740fba..f287d53cf45 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalSymmetryAlgorithm/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalSymmetryAlgorithm/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
-#Mon Jul 13 15:53:33 CEST 2009
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalSymmetryAlgorithm/META-INF/MANIFEST.MF b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalSymmetryAlgorithm/META-INF/MANIFEST.MF
index 01fd25241cb..cf7d0ad5245 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalSymmetryAlgorithm/META-INF/MANIFEST.MF
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalSymmetryAlgorithm/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@ Bundle-Activator: org.eclipse.papyrus.layout.algorithms.horizontalsymm
etryalgorithm.Activator
Bundle-SymbolicName: org.eclipse.papyrus.layout.algorithms.horizontalS
ymmetryAlgorithm;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalSymmetryAlgorithm/build.properties b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalSymmetryAlgorithm/build.properties
index a1343473079..fe083008ca7 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalSymmetryAlgorithm/build.properties
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalSymmetryAlgorithm/build.properties
@@ -2,6 +2,6 @@
#Thu Sep 15 16:42:19 CEST 2011
bin.includes=META-INF/,.,icons/,about.html,plugin.properties,plugin.xml
output..=bin/
-src.includes=META-INF/,.,icons/,about.html,plugin.properties,plugin.xml
+src.includes = about.html
source..=src/
bin..=bin/
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalTreeAlgorithm/.classpath b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalTreeAlgorithm/.classpath
index 2d1a4302f04..8a8f1668cdc 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalTreeAlgorithm/.classpath
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalTreeAlgorithm/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalTreeAlgorithm/.settings/org.eclipse.jdt.core.prefs b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalTreeAlgorithm/.settings/org.eclipse.jdt.core.prefs
index 4c7603ef746..f287d53cf45 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalTreeAlgorithm/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalTreeAlgorithm/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
-#Tue May 26 16:46:37 CEST 2009
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalTreeAlgorithm/META-INF/MANIFEST.MF b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalTreeAlgorithm/META-INF/MANIFEST.MF
index 2a29a33b270..aab90fd90a3 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalTreeAlgorithm/META-INF/MANIFEST.MF
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalTreeAlgorithm/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@ Bundle-Activator: org.eclipse.papyrus.layout.algorithms.horizontaltree
algorithm.Activator
Bundle-SymbolicName: org.eclipse.papyrus.layout.algorithms.horizontalT
reeAlgorithm;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalTreeAlgorithm/build.properties b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalTreeAlgorithm/build.properties
index a9ba701c271..1c6133a3b8a 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalTreeAlgorithm/build.properties
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalTreeAlgorithm/build.properties
@@ -2,6 +2,6 @@
#Thu Sep 15 16:42:19 CEST 2011
bin.includes=META-INF/,.,plugin.xml,icons/,about.html,plugin.properties
output..=bin/
-src.includes=META-INF/,.,plugin.xml,icons/,about.html,plugin.properties
+src.includes = about.html
source..=src/
bin..=bin/
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.radialAlgorithm/.classpath b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.radialAlgorithm/.classpath
index 2d1a4302f04..8a8f1668cdc 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.radialAlgorithm/.classpath
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.radialAlgorithm/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.radialAlgorithm/.settings/org.eclipse.jdt.core.prefs b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.radialAlgorithm/.settings/org.eclipse.jdt.core.prefs
index 07e64b19290..f287d53cf45 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.radialAlgorithm/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.radialAlgorithm/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
-#Wed May 20 14:53:29 CEST 2009
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.radialAlgorithm/META-INF/MANIFEST.MF b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.radialAlgorithm/META-INF/MANIFEST.MF
index 3b1d04ce2d6..26bab7372c6 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.radialAlgorithm/META-INF/MANIFEST.MF
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.radialAlgorithm/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@ Bundle-Activator: org.eclipse.papyrus.layout.algorithms.radialalgorith
m.Activator
Bundle-SymbolicName: org.eclipse.papyrus.layout.algorithms.radialAlgor
ithm;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.radialAlgorithm/build.properties b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.radialAlgorithm/build.properties
index 4a5c7b0c5f8..75a4cd43882 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.radialAlgorithm/build.properties
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.radialAlgorithm/build.properties
@@ -2,6 +2,6 @@
#Thu Sep 15 16:42:20 CEST 2011
bin.includes=META-INF/,.,plugin.xml,icons/,about.html,plugin.properties
output..=bin/
-src.includes=META-INF/,.,plugin.xml,icons/,about.html,plugin.properties
+src.includes = about.html
source..=src/
bin..=bin/
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.springAlgorithm/.classpath b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.springAlgorithm/.classpath
index 2d1a4302f04..8a8f1668cdc 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.springAlgorithm/.classpath
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.springAlgorithm/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.springAlgorithm/.settings/org.eclipse.jdt.core.prefs b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.springAlgorithm/.settings/org.eclipse.jdt.core.prefs
index b13d96af241..f287d53cf45 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.springAlgorithm/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.springAlgorithm/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
-#Mon May 25 10:49:19 CEST 2009
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.springAlgorithm/META-INF/MANIFEST.MF b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.springAlgorithm/META-INF/MANIFEST.MF
index a9cd5dd9b91..42381432194 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.springAlgorithm/META-INF/MANIFEST.MF
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.springAlgorithm/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@ Bundle-Activator: org.eclipse.papyrus.layout.algorithms.springalgorith
m.Activator
Bundle-SymbolicName: org.eclipse.papyrus.layout.algorithms.springAlgor
ithm;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.springAlgorithm/build.properties b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.springAlgorithm/build.properties
index 4a5c7b0c5f8..75a4cd43882 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.springAlgorithm/build.properties
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.springAlgorithm/build.properties
@@ -2,6 +2,6 @@
#Thu Sep 15 16:42:20 CEST 2011
bin.includes=META-INF/,.,plugin.xml,icons/,about.html,plugin.properties
output..=bin/
-src.includes=META-INF/,.,plugin.xml,icons/,about.html,plugin.properties
+src.includes = about.html
source..=src/
bin..=bin/
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.treeAlgorithm/.classpath b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.treeAlgorithm/.classpath
index 2d1a4302f04..8a8f1668cdc 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.treeAlgorithm/.classpath
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.treeAlgorithm/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.treeAlgorithm/.settings/org.eclipse.jdt.core.prefs b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.treeAlgorithm/.settings/org.eclipse.jdt.core.prefs
index 0dfe695608b..f287d53cf45 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.treeAlgorithm/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.treeAlgorithm/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
-#Mon May 25 10:27:15 CEST 2009
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.treeAlgorithm/META-INF/MANIFEST.MF b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.treeAlgorithm/META-INF/MANIFEST.MF
index bd9085abd17..611ab11fbb1 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.treeAlgorithm/META-INF/MANIFEST.MF
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.treeAlgorithm/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@ Bundle-Activator: org.eclipse.papyrus.layout.algorithms.treealgorithm.
Activator
Bundle-SymbolicName: org.eclipse.papyrus.layout.algorithms.treeAlgorit
hm;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.treeAlgorithm/build.properties b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.treeAlgorithm/build.properties
index 4a5c7b0c5f8..75a4cd43882 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.treeAlgorithm/build.properties
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.treeAlgorithm/build.properties
@@ -2,6 +2,6 @@
#Thu Sep 15 16:42:20 CEST 2011
bin.includes=META-INF/,.,plugin.xml,icons/,about.html,plugin.properties
output..=bin/
-src.includes=META-INF/,.,plugin.xml,icons/,about.html,plugin.properties
+src.includes = about.html
source..=src/
bin..=bin/
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalAlgorithm/.classpath b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalAlgorithm/.classpath
index 2d1a4302f04..8a8f1668cdc 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalAlgorithm/.classpath
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalAlgorithm/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalAlgorithm/.settings/org.eclipse.jdt.core.prefs b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalAlgorithm/.settings/org.eclipse.jdt.core.prefs
index bd6af1a78d3..f287d53cf45 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalAlgorithm/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalAlgorithm/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
-#Tue May 26 16:40:39 CEST 2009
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalAlgorithm/META-INF/MANIFEST.MF b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalAlgorithm/META-INF/MANIFEST.MF
index ecb9f26bb3b..d8ecf5ab5fa 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalAlgorithm/META-INF/MANIFEST.MF
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalAlgorithm/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@ Bundle-Activator: org.eclipse.papyrus.layout.algorithms.verticalalgori
thm.Activator
Bundle-SymbolicName: org.eclipse.papyrus.layout.algorithms.verticalAlg
orithm;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalAlgorithm/build.properties b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalAlgorithm/build.properties
index 4a5c7b0c5f8..75a4cd43882 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalAlgorithm/build.properties
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalAlgorithm/build.properties
@@ -2,6 +2,6 @@
#Thu Sep 15 16:42:20 CEST 2011
bin.includes=META-INF/,.,plugin.xml,icons/,about.html,plugin.properties
output..=bin/
-src.includes=META-INF/,.,plugin.xml,icons/,about.html,plugin.properties
+src.includes = about.html
source..=src/
bin..=bin/
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalSymmetryAlgorithm/.classpath b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalSymmetryAlgorithm/.classpath
index 2d1a4302f04..8a8f1668cdc 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalSymmetryAlgorithm/.classpath
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalSymmetryAlgorithm/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalSymmetryAlgorithm/.settings/org.eclipse.jdt.core.prefs b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalSymmetryAlgorithm/.settings/org.eclipse.jdt.core.prefs
index 36df415c5e5..f287d53cf45 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalSymmetryAlgorithm/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalSymmetryAlgorithm/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
-#Wed Jul 15 15:00:32 CEST 2009
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalSymmetryAlgorithm/META-INF/MANIFEST.MF b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalSymmetryAlgorithm/META-INF/MANIFEST.MF
index f7b7a147e2c..48ecd70db71 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalSymmetryAlgorithm/META-INF/MANIFEST.MF
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalSymmetryAlgorithm/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@ Bundle-Activator: org.eclipse.papyrus.layout.algorithms.verticalsymmet
ryalgorithm.Activator
Bundle-SymbolicName: org.eclipse.papyrus.layout.algorithms.verticalSym
metryAlgorithm;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalSymmetryAlgorithm/build.properties b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalSymmetryAlgorithm/build.properties
index 4a5c7b0c5f8..75a4cd43882 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalSymmetryAlgorithm/build.properties
+++ b/extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalSymmetryAlgorithm/build.properties
@@ -2,6 +2,6 @@
#Thu Sep 15 16:42:20 CEST 2011
bin.includes=META-INF/,.,plugin.xml,icons/,about.html,plugin.properties
output..=bin/
-src.includes=META-INF/,.,plugin.xml,icons/,about.html,plugin.properties
+src.includes = about.html
source..=src/
bin..=bin/
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout/.classpath b/extraplugins/layout/org.eclipse.papyrus.layout/.classpath
index 2d1a4302f04..8a8f1668cdc 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout/.classpath
+++ b/extraplugins/layout/org.eclipse.papyrus.layout/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout/.settings/org.eclipse.jdt.core.prefs b/extraplugins/layout/org.eclipse.papyrus.layout/.settings/org.eclipse.jdt.core.prefs
index 8cc865a6b17..f287d53cf45 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/layout/org.eclipse.papyrus.layout/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
-#Mon May 04 09:26:43 CEST 2009
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout/META-INF/MANIFEST.MF b/extraplugins/layout/org.eclipse.papyrus.layout/META-INF/MANIFEST.MF
index af24dc87bc5..a534707af41 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout/META-INF/MANIFEST.MF
+++ b/extraplugins/layout/org.eclipse.papyrus.layout/META-INF/MANIFEST.MF
@@ -14,5 +14,5 @@ Bundle-Name: %pluginName
Bundle-Activator: org.eclipse.papyrus.layout.Activator
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.layout;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout/build.properties b/extraplugins/layout/org.eclipse.papyrus.layout/build.properties
index 20049a3f54a..10578d0033f 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout/build.properties
+++ b/extraplugins/layout/org.eclipse.papyrus.layout/build.properties
@@ -2,6 +2,6 @@
#Thu Sep 15 16:42:18 CEST 2011
bin.includes=plugin.xml,META-INF/,.,icons/,schema/,about.html,plugin.properties
output..=bin/
-src.includes=plugin.xml,META-INF/,.,icons/,schema/,about.html,plugin.properties
+src.includes = about.html
source..=src/
bin..=bin/
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout/plugin.xml b/extraplugins/layout/org.eclipse.papyrus.layout/plugin.xml
index 562b3b2245f..4097be92f17 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout/plugin.xml
+++ b/extraplugins/layout/org.eclipse.papyrus.layout/plugin.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.2"?>
<plugin>
- <extension-point id="org.eclipse.papyrus.layout" name="layouttool" schema="schema/org.eclipse.papyrus.layouttool.exsd"/>
- <extension-point id="org.eclipse.papyrus.layout.algorithms" name="algorithms" schema="schema/org.eclipse.papyrus.layouttool.algorithms.exsd"/>
+ <extension-point id="org.eclipse.papyrus.layout" name="layouttool" schema="schema/org.eclipse.papyrus.layout.exsd"/>
+ <extension-point id="org.eclipse.papyrus.layout.algorithms" name="algorithms" schema="schema/org.eclipse.papyrus.layout.algorithms.exsd"/>
<extension
point="org.eclipse.ui.menus">
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout/src/org/eclipse/papyrus/layout/LayoutToolToolbar.java b/extraplugins/layout/org.eclipse.papyrus.layout/src/org/eclipse/papyrus/layout/LayoutToolToolbar.java
index ab65ed155b7..bfb1576b1a5 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout/src/org/eclipse/papyrus/layout/LayoutToolToolbar.java
+++ b/extraplugins/layout/org.eclipse.papyrus.layout/src/org/eclipse/papyrus/layout/LayoutToolToolbar.java
@@ -1,7 +1,7 @@
/*****************************************************************************
* Copyright (c) 2009 Atos Origin.
*
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -31,8 +31,8 @@ import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.papyrus.layout.managealgorithms.ZestAlgortihms;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
@@ -90,8 +90,7 @@ public class LayoutToolToolbar extends ContributionItem {
static {
try {
- imageLayout = new Image(Display.getDefault(), Activator.getDefault().getBundle().getEntry(
- "icons/layoutIcon.gif").openStream());
+ imageLayout = new Image(Display.getDefault(), Activator.getDefault().getBundle().getEntry("icons/layoutIcon.gif").openStream());
} catch (IOException e) {
Activator.getDefault().log("Cannot load layoutIcon", e);
}
@@ -106,7 +105,7 @@ public class LayoutToolToolbar extends ContributionItem {
/**
* Instantiates a new layout tool toolbar.
- *
+ *
* @param id
* the id
*/
@@ -132,6 +131,7 @@ public class LayoutToolToolbar extends ContributionItem {
getMenu(toolBar);
itemDropDown.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event event) {
getMenu(toolbar);
if(event.detail == SWT.ARROW) {
@@ -145,10 +145,10 @@ public class LayoutToolToolbar extends ContributionItem {
Listener selectionListener = new Listener() {
+ @Override
public void handleEvent(Event event) {
getSelection();
- if(currentAlgorithm == null && event.y == 0 && itemForMenu.getData() != null
- && itemForMenu.getData().equals(itemLayoutText)) {
+ if(currentAlgorithm == null && event.y == 0 && itemForMenu.getData() != null && itemForMenu.getData().equals(itemLayoutText)) {
createLayoutArea();
}
if(hasElementsSelected()) {
@@ -176,10 +176,10 @@ public class LayoutToolToolbar extends ContributionItem {
/**
* Gets the menu.
- *
+ *
* @param parent
* the parent
- *
+ *
* @return Menu
*/
public Menu getMenu(Control parent) {
@@ -239,6 +239,7 @@ public class LayoutToolToolbar extends ContributionItem {
toolTip.setMessage(((LayoutToolAlgorithms)item.getData()).getToolTipText());
item.addListener(SWT.Arm, new Listener() {
+ @Override
public void handleEvent(Event event) {
if(currentToolTip != null) {
currentToolTip.setVisible(false);
@@ -257,6 +258,7 @@ public class LayoutToolToolbar extends ContributionItem {
} else {
item.addListener(SWT.Arm, new Listener() {
+ @Override
public void handleEvent(Event event) {
if(currentToolTip != null) {
currentToolTip.setVisible(false);
@@ -268,11 +270,9 @@ public class LayoutToolToolbar extends ContributionItem {
}
});
}
- item.addSelectionListener(new SelectionListener() {
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
+ item.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
if(((MenuItem)e.getSource()).getSelection()) {
if(currentToolTip != null) {
@@ -287,7 +287,7 @@ public class LayoutToolToolbar extends ContributionItem {
/**
* Handle selected.
- *
+ *
* @param e
* the e
* @param item
@@ -307,17 +307,9 @@ public class LayoutToolToolbar extends ContributionItem {
callAlgorithm();
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.action.ContributionItem#dispose()
- */
- public void dispose() {
- }
-
/**
* Run.
- *
+ *
* @param action
* the action
*/
@@ -338,7 +330,7 @@ public class LayoutToolToolbar extends ContributionItem {
/**
* Selection changed.
- *
+ *
* @param action
* the action
* @param selection
@@ -350,25 +342,24 @@ public class LayoutToolToolbar extends ContributionItem {
/**
* Gets the selection.
- *
+ *
* @return selection
*/
public ISelection getSelection() {
- theSelection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor().getSite()
- .getSelectionProvider().getSelection();
+ theSelection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor().getSite().getSelectionProvider().getSelection();
return theSelection;
}
/**
* Gets the edit part selected.
- *
+ *
* @return list editParts selected
*/
public List<EditPart> getEditPartSelected() {
List<EditPart> editParts = new ArrayList<EditPart>();
if(theSelection instanceof IStructuredSelection) {
IStructuredSelection selec = (IStructuredSelection)theSelection;
- List objects = selec.toList();
+ List<?> objects = selec.toList();
for(Object iter : objects) {
if(iter instanceof EditPart) {
EditPart e = (EditPart)iter;
@@ -382,13 +373,14 @@ public class LayoutToolToolbar extends ContributionItem {
/**
* Sort editParts to have editParts which have less parents in first.
- *
+ *
* @param editParts
* the edit parts
*/
public static void sort(List<EditPart> editParts) {
Collections.sort(editParts, new Comparator<EditPart>() {
+ @Override
public int compare(EditPart arg0, EditPart arg1) {
return getNbParents(arg0) - getNbParents(arg1);
}
@@ -397,10 +389,10 @@ public class LayoutToolToolbar extends ContributionItem {
/**
* Gets the nb parents.
- *
+ *
* @param part
* editPart
- *
+ *
* @return number parents of the editPart
*/
private static int getNbParents(EditPart part) {
@@ -415,7 +407,7 @@ public class LayoutToolToolbar extends ContributionItem {
/**
* Checks for elements selected.
- *
+ *
* @return false if 0 or 1 element selected else return true
*/
private boolean hasElementsSelected() {
@@ -440,14 +432,14 @@ public class LayoutToolToolbar extends ContributionItem {
final MenuItem itemLayout = new MenuItem(menu, SWT.PUSH);
itemLayout.setText(itemLayoutText);
try {
- itemLayout.setImage(new Image(Display.getDefault(), Activator.getDefault().getBundle().getEntry(
- "icons/layout_area.gif").openStream()));
+ itemLayout.setImage(new Image(Display.getDefault(), Activator.getDefault().getBundle().getEntry("icons/layout_area.gif").openStream()));
} catch (IOException e) {
Activator.getDefault().log("Cannot load layout area icon", e);
}
layoutToolTip = new ToolTip(menu.getShell(), SWT.NONE);
itemLayout.addListener(SWT.Arm, new Listener() {
+ @Override
public void handleEvent(Event event) {
if(currentToolTip != null) {
currentToolTip.setVisible(false);
@@ -461,11 +453,9 @@ public class LayoutToolToolbar extends ContributionItem {
layoutToolTip.setLocation(new Point(x, y));
}
});
- itemLayout.addSelectionListener(new SelectionListener() {
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
+ itemLayout.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
if(layoutToolTip != null) {
layoutToolTip.setVisible(false);
diff --git a/extraplugins/layout/org.eclipse.papyrus.layout/src/org/eclipse/papyrus/layout/managealgorithms/ZestAlgortihms.java b/extraplugins/layout/org.eclipse.papyrus.layout/src/org/eclipse/papyrus/layout/managealgorithms/ZestAlgortihms.java
index c7c5135e525..c095b85ee81 100644
--- a/extraplugins/layout/org.eclipse.papyrus.layout/src/org/eclipse/papyrus/layout/managealgorithms/ZestAlgortihms.java
+++ b/extraplugins/layout/org.eclipse.papyrus.layout/src/org/eclipse/papyrus/layout/managealgorithms/ZestAlgortihms.java
@@ -1,7 +1,7 @@
/*****************************************************************************
* Copyright (c) 2009 Atos Origin.
*
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -38,18 +38,16 @@ public class ZestAlgortihms {
/**
* Gets the registered algorithmes.
- *
+ *
* @return collection of algorithms registered
*/
public static Collection<LayoutToolAlgorithms> getRegisteredAlgorithmes() {
- IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(
- Constants.EXTENSION_POINT_ID_ALGORITHMS);
+ IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(Constants.EXTENSION_POINT_ID_ALGORITHMS);
LinkedList<LayoutToolAlgorithms> algo = new LinkedList<LayoutToolAlgorithms>();
for(IConfigurationElement e : elements) {
try {
LayoutToolAlgorithms algorithm = new LayoutToolAlgorithms();
- AlgorithmFactory factory = (AlgorithmFactory)e
- .createExecutableExtension(Constants.EXTENSION_CLASS_ALGORITHMS);
+ AlgorithmFactory factory = (AlgorithmFactory)e.createExecutableExtension(Constants.EXTENSION_CLASS_ALGORITHMS);
algorithm.setAlgorithm(factory.createAlgorithm());
if(e.getAttribute(Constants.EXTENSION_NAME) != null) {
String name = e.getAttribute(Constants.EXTENSION_NAME);
@@ -72,6 +70,7 @@ public class ZestAlgortihms {
if(!algo.isEmpty()) {
Collections.sort(algo, new Comparator<LayoutToolAlgorithms>() {
+ @Override
public int compare(LayoutToolAlgorithms arg0, LayoutToolAlgorithms arg1) {
int length0 = 0;
if(arg0.getPath() != null) {
@@ -86,12 +85,6 @@ public class ZestAlgortihms {
if(length1 == length0) {
String a = arg0.getPath() + arg0.getName();
String b = arg1.getPath() + arg1.getName();
- if(a == null) {
- a = "";
- }
- if(b == null) {
- b = "";
- }
return a.compareTo(b);
}
return length1 - length0;
@@ -105,10 +98,10 @@ public class ZestAlgortihms {
/**
* Format.
- *
+ *
* @param name
* of algorithm
- *
+ *
* @return name formated
*/
private static String format(String name) {
@@ -126,12 +119,12 @@ public class ZestAlgortihms {
/**
* Gets the icon.
- *
+ *
* @param e
* IConfigurationElement
* @param attribute
* name of icon
- *
+ *
* @return icon of algorithm
*/
private static Image getIcon(IConfigurationElement e, String attribute) {

Back to the top